Misc fixes.

schlangster · schlangster · commit 013cf80f74b5 · 2014-05-25T13:16:59.000+02:00
diff --git a/include/react/common/Containers.h b/include/react/common/Containers.h
@@ -16,7 +16,7 @@
 /***************************************/ REACT_IMPL_BEGIN /**************************************/
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-/// BitField
+/// EnumFlags
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 template <typename T>
 class EnumFlags
diff --git a/include/react/common/Timing.h b/include/react/common/Timing.h
@@ -74,17 +74,31 @@ class ConditionalTimer<threshold,true>
         ScopedTimer(ConditionalTimer& parent) :
             parent_{ parent }
         {
-            if (parent_.shouldMeasure_)
-                QueryPerformanceCounter(&startTime_);
+            if (!parent_.shouldMeasure_)
+                return;
+
+            startMeasure();
         }
 
-        ~ScopedTimer()
+        // Note: virtual for performance reasons
+        virtual ~ScopedTimer()
         {
             if (!parent_.shouldMeasure_)
                 return;
 
             parent_.shouldMeasure_ = false;
+            
+            endMeasure();
+        }
+
+    private:
+        void startMeasure()
+        {
+            QueryPerformanceCounter(&startTime_);
+        }
 
+        void endMeasure()
+        {
             LARGE_INTEGER endTime, durationMS;
 
             QueryPerformanceCounter(&endTime);
@@ -96,7 +110,6 @@ class ConditionalTimer<threshold,true>
             parent_.isThresholdExceeded_ = durationMS.QuadPart > threshold;
         }
 
-    private:
         ConditionalTimer& parent_;
         
         LARGE_INTEGER startTime_;  
diff --git a/include/react/common/Util.h b/include/react/common/Util.h
@@ -8,7 +8,6 @@
 
 #include "react/detail/Defs.h"
 
-#include <ctime>
 #include <functional>
 #include <tuple>
 #include <type_traits>
diff --git a/include/react/detail/graph/SignalNodes.h b/include/react/detail/graph/SignalNodes.h
@@ -34,7 +34,7 @@ class SignalNode : public ReactiveNode<D,S,S>
     SignalNode() = default;
 
     template <typename T>
-    SignalNode(T&& value) :
+    explicit SignalNode(T&& value) :
         ReactiveNode{ },
         value_{ std::forward<T>(value) }
     {}
diff --git a/src/benchmark/BenchmarkBase.h b/src/benchmark/BenchmarkBase.h
@@ -7,9 +7,11 @@
 #pragma once
 
 #include <cfloat>
+#include <ctime>
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
+#include <random>
 
 #include "react/common/Util.h"
 
