Remove obsolete #if's. Remove VariadicTemplates for WP7.

reactiveui · Apr 2, 2013 · 713978b · 713978b
1 parent 8b94898
commit 713978b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 346 deletions.
diff --git a/ReactiveUI/MakeObjectReactiveHelper.cs b/ReactiveUI/MakeObjectReactiveHelper.cs
@@ -45,22 +45,14 @@ public IDisposable SuppressChangeNotifications()
             new ScheduledSubject<IObservedChange<object, object>>(RxApp.DeferredScheduler);
 
         public IObservable<IObservedChange<object, object>> Changing {
-#if SILVERLIGHT
-            get { return _Changing.Where(_ => _changeCountSuppressed == 0); }
-#else 
             get { return _Changing.Where(_ => Interlocked.Read(ref _changeCountSuppressed) == 0); }
-#endif
         }
 
         ISubject<IObservedChange<object, object>> _Changed = 
             new ScheduledSubject<IObservedChange<object, object>>(RxApp.DeferredScheduler);
 
         public IObservable<IObservedChange<object, object>> Changed {
-#if SILVERLIGHT
-            get { return _Changed.Where(_ => _changeCountSuppressed == 0); }
-#else 
             get { return _Changed.Where(_ => Interlocked.Read(ref _changeCountSuppressed) == 0); }
-#endif
         }
     }
 }
diff --git a/ReactiveUI/ObservableAsyncMRUCache.cs b/ReactiveUI/ObservableAsyncMRUCache.cs
@@ -203,11 +203,7 @@ internal class SemaphoreSubject<T> : ISubject<T>, IEnableLogger
         public SemaphoreSubject(int maxCount, IScheduler sched = null)
         {
             this.Log().Debug("maxCount is '{0}'", maxCount);
-#if WP7
-            _inner = new Subject<T>();
-#else
             _inner = (sched != null ? (ISubject<T>)new ScheduledSubject<T>(sched) : new Subject<T>());
-#endif
             _maxCount = maxCount;
         }
 

diff --git a/ReactiveUI/ReactiveCollection.cs b/ReactiveUI/ReactiveCollection.cs
@@ -63,9 +63,6 @@ public ReactiveCollection(IEnumerable<T> initialContents = null, IScheduler sche
         }
 
         [OnDeserialized]
-#if WP7
-		public
-#endif
         void setupRx(StreamingContext _) { setupRx(); }
 
         void setupRx(IEnumerable<T> initialContents = null, IScheduler scheduler = null, double resetChangeThreshold = 0.3)

diff --git a/ReactiveUI/ReactiveObject.cs b/ReactiveUI/ReactiveObject.cs
@@ -73,9 +73,6 @@ protected ReactiveObject()
         }
 
         [OnDeserialized]
-#if WP7
-        public
-#endif
         void setupRxObj(StreamingContext sc) { setupRxObj(); }
 
         void setupRxObj()
@@ -168,14 +165,8 @@ void verifyPropertyName(string propertyName)
         }
 
         protected bool areChangeNotificationsEnabled {
-            get { 
+            get {
-#if SILVERLIGHT
+                return (Interlocked.Read(ref changeNotificationsSuppressed) == 0);
-                // N.B. On most architectures, machine word aligned reads are 
-                // guaranteed to be atomic - sorry WP7, you're out of luck
-                return changeNotificationsSuppressed == 0;
-#else
-                return (Interlocked.Read(ref changeNotificationsSuppressed) == 0); 
-#endif
             }
         }
 

diff --git a/ReactiveUI/RoutingState.cs b/ReactiveUI/RoutingState.cs
@@ -60,10 +60,8 @@ public RoutingState()
         }
 
         [OnDeserialized]
-#if WP7
-        public
-#endif
         void setupRx(StreamingContext sc) { setupRx();  }
+
         void setupRx()
         {
             if (rxObjectsSetup) return;

diff --git a/ReactiveUI/VariadicTemplates_WP7.cs b/ReactiveUI/VariadicTemplates_WP7.cs