Push LazyStat down into catch_reporter_streaming_base.hpp

src/catch2/interfaces/catch_interfaces_reporter.hpp

@@ -13,7 +13,6 @@
 #include <catch2/catch_totals.hpp>
 #include <catch2/catch_assertion_result.hpp>
 #include <catch2/internal/catch_message_info.hpp>
-#include <catch2/internal/catch_option.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 
@@ -46,20 +45,6 @@ namespace Catch {
         IConfig const* m_fullConfig;
     };
 
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
     struct TestRunInfo {
         TestRunInfo( std::string const& _name );
         std::string name;

src/catch2/internal/catch_run_context.hpp

@@ -17,6 +17,7 @@
 #include <catch2/internal/catch_test_case_tracker.hpp>
 #include <catch2/catch_assertion_info.hpp>
 #include <catch2/catch_assertion_result.hpp>
+#include <catch2/internal/catch_option.hpp>
 
 #include <string>
 

src/catch2/reporters/catch_reporter_streaming_base.hpp

@@ -3,12 +3,29 @@
 
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 
+#include <catch2/internal/catch_option.hpp>
+
 #include <iosfwd>
 #include <string>
 #include <vector>
 
 namespace Catch {
-        
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=(T const& _value) {
+            Option<T>::operator=(_value);
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+
     struct StreamingReporterBase : IStreamingReporter {
 
         StreamingReporterBase( ReporterConfig const& _config ):