General cleanup

CMakeLists.txt

@@ -222,6 +222,7 @@ set(IMPL_SOURCES
         ${HEADER_DIR}/internal/catch_stringdata.cpp
         ${HEADER_DIR}/internal/catch_stringref.cpp
         ${HEADER_DIR}/internal/catch_string_manip.cpp
+        ${HEADER_DIR}/internal/catch_tag_alias.cpp
         ${HEADER_DIR}/internal/catch_tag_alias_registry.cpp
         ${HEADER_DIR}/internal/catch_test_case_info.cpp
         ${HEADER_DIR}/internal/catch_test_case_tracker.cpp

include/internal/catch_commandline.cpp

@@ -8,7 +8,6 @@
 
 #include "catch_commandline.hpp"
 
-#include "catch_common.h"
 #include "catch_string_manip.h"
 
 #include <fstream>

include/internal/catch_context.cpp

@@ -5,9 +5,6 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#ifndef TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
-
 #include "catch_context.h"
 #include "catch_common.h"
 
@@ -63,5 +60,3 @@ namespace Catch {
         currentContext = nullptr;
     }
 }
-
-#endif // TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED

include/internal/catch_option.hpp

@@ -8,8 +8,6 @@
 #ifndef TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
 
-#include "catch_common.h"
-
 namespace Catch {
 
     // An optional type

include/internal/catch_result_builder.cpp

@@ -168,4 +168,10 @@ namespace Catch {
         m_guardException = false;
     }
 
+    CopyableStream& ResultBuilder::m_stream() {
+        static CopyableStream s;
+        return s;
+    }
+
+
 } // end namespace Catch

include/internal/catch_result_builder.h

@@ -75,11 +75,7 @@ namespace Catch {
         AssertionInfo m_assertionInfo;
         AssertionResultData m_data;
 
-        static CopyableStream &m_stream()
-        {
-            static CopyableStream s;
-            return s;
-        }
+        static CopyableStream& m_stream();
 
         bool m_shouldDebugBreak = false;
         bool m_shouldThrow = false;

include/internal/catch_tag_alias.h

@@ -15,7 +15,7 @@
 namespace Catch {
 
     struct TagAlias {
-        TagAlias( std::string const& _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {}
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
 
         std::string tag;
         SourceLineInfo lineInfo;

include/internal/catch_tag_alias_registry.cpp

@@ -53,13 +53,4 @@ namespace Catch {
         return getRegistryHub().getTagAliasRegistry();
     }
 
-    RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
-        try {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } catch (...) {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException(std::current_exception());
-        }
-    }
-
 } // end namespace Catch

include/internal/catch_test_case_info.cpp

@@ -9,7 +9,6 @@
 #include "catch_test_spec.hpp"
 #include "catch_test_case_info.h"
 #include "catch_interfaces_testcase.h"
-#include "catch_common.h"
 #include "catch_string_manip.h"
 
 #include <cctype>

include/internal/catch_test_case_info.h

@@ -8,8 +8,6 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
-#include "catch_common.h"
-
 #include <string>
 #include <set>
 #include <memory>

include/internal/catch_tostring.h

@@ -8,21 +8,18 @@
 #ifndef TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
 
-#include "catch_common.h"
 
 #include <sstream>
 #include <vector>
 #include <cstddef>
+#include <tuple>
+#include <type_traits>
+#include <string>
 
 #ifdef __OBJC__
 #include "catch_objc_arc.hpp"
 #endif
 
-#include <tuple>
-
-#include <type_traits>
-
-#include <string>
 
 // We need a dummy global operator<< so we can bring it into Catch namespace later
 struct Catch_global_namespace_dummy;