Warnings cleanup

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Proxies / RealProxy.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
index 0d5d4565a8eb07014a6bae1421b828dfe184c22f..a97ab10d397ada5b66c4a3e6b0fda56c3b362f2a 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
@@ -47,13 +47,13 @@ using System.Runtime.InteropServices;
 
 namespace System.Runtime.Remoting.Proxies
 {
-#pragma warning disable 169
+#pragma warning disable 169, 649
        internal class TransparentProxy {
                public RealProxy _rp;
                IntPtr _class;
                bool _custom_type_info;
        }
-#pragma warning restore 169    
+#pragma warning restore 169, 649
        
 #if NET_2_0
        [ComVisible (true)]
@@ -72,8 +72,8 @@ namespace System.Runtime.Remoting.Proxies
                int _targetDomainId = -1;
                internal string _targetUri;
                internal Identity _objectIdentity;
-               Object _objTP;\r
-               object _stubData;\r
+               Object _objTP;
+               object _stubData;
         #endregion
 #pragma warning restore 169, 414
 
@@ -120,8 +120,8 @@ namespace System.Runtime.Remoting.Proxies
 
                public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
                {
-                       Object obj = GetTransparentProxy();\r
-                       RemotingServices.GetObjectData (obj, info, context);            \r
+                       Object obj = GetTransparentProxy();
+                       RemotingServices.GetObjectData (obj, info, context);            
                }
                
                internal Identity ObjectIdentity
@@ -171,7 +171,7 @@ namespace System.Runtime.Remoting.Proxies
 
                        IMethodReturnMessage res_msg = null;
                        
-                       if (call_type == CallType.BeginInvoke) \r
+                       if (call_type == CallType.BeginInvoke) 
                                // todo: set CallMessage in runtime instead
                                mMsg.AsyncResult.CallMessage = mMsg;
 
@@ -179,30 +179,30 @@ namespace System.Runtime.Remoting.Proxies
                                res_msg = (IMethodReturnMessage)mMsg.AsyncResult.EndInvoke ();
 
                        // Check for constructor msg
-                       if (mMsg.MethodBase.IsConstructor) \r
+                       if (mMsg.MethodBase.IsConstructor) 
                        {
-                               if (is_remproxy) \r
+                               if (is_remproxy) 
                                        res_msg = (IMethodReturnMessage) (rp as RemotingProxy).ActivateRemoteObject ((IMethodMessage) msg);
-                               else \r
+                               else 
                                        msg = new ConstructionCall (rp.GetProxiedType ());
                        }
                                
                        if (null == res_msg) 
                        {
                                res_msg = (IMethodReturnMessage)rp.Invoke (msg);
-\r
-                               // Note, from begining this code used AsyncResult.IsCompleted for\r
-                               // checking if it was a remoting or custom proxy, but in some\r
-                               // cases the remoting proxy finish before the call returns\r
-                               // causing this method to be called, therefore causing all kind of bugs.\r
-                               if ((!is_remproxy) && call_type == CallType.BeginInvoke)\r
-                               {\r
+
+                               // Note, from begining this code used AsyncResult.IsCompleted for
+                               // checking if it was a remoting or custom proxy, but in some
+                               // cases the remoting proxy finish before the call returns
+                               // causing this method to be called, therefore causing all kind of bugs.
+                               if ((!is_remproxy) && call_type == CallType.BeginInvoke)
+                               {
                                        IMessage asyncMsg = null;
 
                                        // allow calltype EndInvoke to finish
                                        asyncMsg = mMsg.AsyncResult.SyncProcessMessage (res_msg as IMessage);
                                        res_msg = new ReturnMessage (asyncMsg, null, 0, null, res_msg as IMethodCallMessage);
-                               }\r
+                               }
                        }
                        
                        if (res_msg.LogicalCallContext != null && res_msg.LogicalCallContext.HasInfo)