Merge pull request #556 from jack-pappas/ipproto-patch

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Messaging / RemotingSurrogateSelector.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
index e22cc44b3e5c6c2e52dcb9602479d2b6156fac89..e192549dac9d6468d5a8ff24a4c45ea94271ac8c 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
@@ -36,16 +36,14 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.Remoting.Messaging {
 
-#if NET_2_0
        [System.Runtime.InteropServices.ComVisible (true)]
-#endif
        public class RemotingSurrogateSelector : ISurrogateSelector
        {
-               static Type s_cachedTypeObjRef = typeof(ObjRef);\r
+               static Type s_cachedTypeObjRef = typeof(ObjRef);
                static ObjRefSurrogate _objRefSurrogate = new ObjRefSurrogate();
                static RemotingSurrogate _objRemotingSurrogate = new RemotingSurrogate();
 
-               Object _rootObj = null;    \r
+               Object _rootObj = null;    
                MessageSurrogateFilter _filter = null;
                ISurrogateSelector _next;