Fixed some errors and warnings on GCC/clang.

schlangster · schlangster · commit 7a52758c6da0 · 2014-07-22T02:59:56.000+02:00
diff --git a/benchmarks/src/BenchmarkRandom.h b/benchmarks/src/BenchmarkRandom.h
@@ -14,6 +14,7 @@
 #include "BenchmarkBase.h"
 #include "react/common/Types.h"
 
+#include "react/Domain.h"
 #include "react/Signal.h"
 
 using namespace react;
diff --git a/include/react/common/Concurrency.h b/include/react/common/Concurrency.h
@@ -86,7 +86,7 @@ class WaitingStateBase : public IWaitingState
     auto Run(F&& func) -> decltype(func(false))
     {// mutex_
         std::lock_guard<std::mutex> scopedLock(mutex_);
-        return func(blocked_);
+        return func(isWaiting_);
     }// ~mutex_
 
     template <typename F>
diff --git a/include/react/detail/ReactiveInput.h b/include/react/detail/ReactiveInput.h
@@ -692,8 +692,6 @@ class InputManager :
     void processAsyncQueue()
     {
         AsyncItem   item;
-        
-        TurnFlagsT  savedFlags = 0;
 
         std::vector<WaitingStatePtrT> waitingStatePtrs;
 
@@ -732,13 +730,11 @@ class InputManager :
             item.Func();
 
             // Merged sync inputs that arrived while this item was queued
-            // Commented out, because thats no longer possible
-            //tr.RunMergedInputs(); 
+            tr.RunMergedInputs(); 
 
             // Save data, item might be re-used for next input
             if (item.WaitingStatePtr != nullptr)
                 waitingStatePtrs.push_back(std::move(item.WaitingStatePtr));
-            savedFlags = item.Flags;
 
             // If the current item supports merging, try to add more mergeable inputs
             // to this turn
