Split the NonCopyable helper out of catch_common.hpp

src/CMakeLists.txt

@@ -38,6 +38,7 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
     ${SOURCES_DIR}/internal/catch_console_width.hpp
     ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
+    ${SOURCES_DIR}/internal/catch_noncopyable.hpp
     ${SOURCES_DIR}/catch_approx.hpp
     ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
     ${SOURCES_DIR}/catch_assertion_info.hpp

src/catch2/catch_all.hpp

@@ -60,6 +60,7 @@
 #include <catch2/internal/catch_list.hpp>
 #include <catch2/internal/catch_message_info.hpp>
 #include <catch2/internal/catch_meta.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_option.hpp>
 #include <catch2/internal/catch_output_redirect.hpp>
 #include <catch2/internal/catch_platform.hpp>

src/catch2/catch_registry_hub.cpp

@@ -18,13 +18,15 @@
 #include <catch2/internal/catch_singletons.hpp>
 #include <catch2/internal/catch_enum_values_registry.hpp>
 #include <catch2/catch_test_case_info.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 
 namespace Catch {
 
     namespace {
 
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+        class RegistryHub : public IRegistryHub,
-                            private NonCopyable {
+                            public IMutableRegistryHub,
+                            private Detail::NonCopyable {
 
         public: // IRegistryHub
             RegistryHub() = default;

src/catch2/catch_session.hpp

@@ -9,12 +9,14 @@
 #define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 
 #include <catch2/internal/catch_commandline.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/catch_config.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
+#include <catch2/internal/catch_compiler_capabilities.hpp>
 
 namespace Catch {
 
-    class Session : NonCopyable {
+    class Session : Detail::NonCopyable {
     public:
 
         Session();

src/catch2/catch_test_case_info.hpp

@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
@@ -44,7 +45,7 @@ namespace Catch {
     };
 
 
-    struct TestCaseInfo : NonCopyable {
+    struct TestCaseInfo : Detail::NonCopyable {
 
         TestCaseInfo(std::string const& _className,
                      NameAndTags const& _tags,

src/catch2/interfaces/catch_interfaces_config.hpp

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 
-#include <catch2/internal/catch_common.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 
 #include <chrono>
 #include <iosfwd>
@@ -53,7 +53,7 @@ namespace Catch {
 
     class TestSpec;
 
-    struct IConfig : NonCopyable {
+    struct IConfig : Detail::NonCopyable {
 
         virtual ~IConfig();
 

src/catch2/interfaces/catch_interfaces_registry_hub.hpp

@@ -8,7 +8,6 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
 
-#include <catch2/internal/catch_common.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 
 #include <string>
@@ -25,6 +24,7 @@ namespace Catch {
     struct ITagAliasRegistry;
     struct ITestInvoker;
     struct IMutableEnumValuesRegistry;
+    struct SourceLineInfo;
 
     class StartupExceptionRegistry;
 

src/catch2/internal/catch_clara.hpp

@@ -30,6 +30,8 @@
 #    endif
 #endif
 
+#include <catch2/internal/catch_noncopyable.hpp>
+
 #include <cassert>
 #include <cctype>
 #include <memory>
@@ -286,15 +288,7 @@ namespace Catch {
             }
 #endif // CLARA_CONFIG_OPTIONAL_TYPE
 
-            struct NonCopyable {
+            struct BoundRef : Catch::Detail::NonCopyable {
-                NonCopyable() = default;
-                NonCopyable( NonCopyable const& ) = delete;
-                NonCopyable( NonCopyable&& ) = delete;
-                NonCopyable& operator=( NonCopyable const& ) = delete;
-                NonCopyable& operator=( NonCopyable&& ) = delete;
-            };
-
-            struct BoundRef : NonCopyable {
                 virtual ~BoundRef() = default;
                 virtual auto isContainer() const -> bool { return false; }
                 virtual auto isFlag() const -> bool { return false; }

src/catch2/internal/catch_common.hpp

@@ -32,15 +32,6 @@ namespace Catch {
         No
     }; };
 
-    class NonCopyable {
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-    protected:
-        NonCopyable() noexcept = default;
-    };
-
     struct SourceLineInfo {
 
         SourceLineInfo() = delete;

src/catch2/internal/catch_context.cpp

@@ -6,12 +6,12 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 #include <catch2/internal/catch_context.hpp>
-#include <catch2/internal/catch_common.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
 
 namespace Catch {
 
-    class Context : public IMutableContext, NonCopyable {
+    class Context : public IMutableContext, private Detail::NonCopyable {
 
     public: // IContext
         IResultCapture* getResultCapture() override {

src/catch2/internal/catch_noncopyable.hpp

@@ -0,0 +1,21 @@
+#ifndef CATCH_NONCOPYABLE_HPP_INCLUDED
+#define CATCH_NONCOPYABLE_HPP_INCLUDED
+
+namespace Catch {
+    namespace Detail {
+
+        //! Deriving classes become noncopyable and nonmovable
+        class NonCopyable {
+            NonCopyable( NonCopyable const& ) = delete;
+            NonCopyable( NonCopyable&& ) = delete;
+            NonCopyable& operator=( NonCopyable const& ) = delete;
+            NonCopyable& operator=( NonCopyable&& ) = delete;
+
+        protected:
+            NonCopyable() noexcept = default;
+        };
+
+    } // namespace Detail
+} // namespace Catch
+
+#endif // CATCH_NONCOPYABLE_HPP_INCLUDED

src/catch2/internal/catch_section.hpp

@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/catch_section_info.hpp>
 #include <catch2/catch_timer.hpp>
 #include <catch2/catch_totals.hpp>
@@ -17,7 +18,7 @@
 
 namespace Catch {
 
-    class Section : NonCopyable {
+    class Section : Detail::NonCopyable {
     public:
         Section( SectionInfo&& info );
         ~Section();

src/catch2/internal/catch_stream.hpp

@@ -9,7 +9,7 @@
 #ifndef TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
 #define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
 
-#include <catch2/internal/catch_common.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 
 #include <iosfwd>
 #include <cstddef>
@@ -30,7 +30,7 @@ namespace Catch {
 
     auto makeStream( StringRef const &filename ) -> IStream const*;
 
-    class ReusableStringStream : NonCopyable {
+    class ReusableStringStream : Detail::NonCopyable {
         std::size_t m_index;
         std::ostream* m_oss;
     public:

src/catch2/internal/catch_test_registry.hpp

@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/interfaces/catch_interfaces_testcase.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_stringref.hpp>
@@ -52,7 +53,7 @@ struct NameAndTags {
     StringRef tags;
 };
 
-struct AutoReg : NonCopyable {
+struct AutoReg : Detail::NonCopyable {
     AutoReg( Detail::unique_ptr<ITestInvoker> invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
 };
 

src/catch2/internal/catch_xmlwriter.hpp

@@ -11,6 +11,13 @@
 #include <catch2/internal/catch_stream.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 
+// FixMe: Without this include (and something inside it), MSVC goes crazy
+//        and reports that calls to XmlEncode's op << are ambiguous between
+//        the declaration and definition.
+//        It also has to be in the header.
+#include <catch2/internal/catch_common.hpp>
+
+
 #include <vector>
 
 namespace Catch {