Переглянути джерело

Merge branch 'dev/bartde/readonly_structs' of https://github.com/dotnet/reactive into dev/bartde/readonly_structs

Bart De Smet 5 роки тому
батько
коміт
d9a6905880

+ 0 - 4
Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Blocking.cs

@@ -322,11 +322,7 @@ namespace System.Reactive.Linq
 
             public void Dispose()
             {
-#if HAS_MREEXPLICITDISPOSABLE
-                ((IDisposable)_evt).Dispose();
-#else
                 _evt.Dispose();
-#endif
             }
         }
 

+ 0 - 4
Rx.NET/Source/src/System.Reactive/Notification.cs

@@ -73,9 +73,7 @@ namespace System.Reactive
         /// <summary>
         /// Represents an OnNext notification to an observer.
         /// </summary>
-#if !NO_DEBUGGER_ATTRIBUTES
         [DebuggerDisplay("OnNext({Value})")]
-#endif
 #if !NO_SERIALIZABLE
         [Serializable]
 #endif
@@ -228,9 +226,7 @@ namespace System.Reactive
         /// <summary>
         /// Represents an OnError notification to an observer.
         /// </summary>
-#if !NO_DEBUGGER_ATTRIBUTES
         [DebuggerDisplay("OnError({Exception})")]
-#endif
 #if !NO_SERIALIZABLE
         [Serializable]
 #endif

+ 0 - 4
Rx.NET/Source/src/System.Reactive/ObservableQuery.cs

@@ -301,11 +301,7 @@ namespace System.Reactive
                 return base.VisitMethodCall(node);
             }
 
-#if NO_VISITLAMBDAOFT
-            protected override Expression VisitLambda(LambdaExpression node)
-#else
             protected override Expression VisitLambda<T>(Expression<T> node)
-#endif
             {
                 return node;
             }