Merge branch 'master' of github.com:philsquared/Catch

include/internal/catch_config.hpp

@@ -5,8 +5,8 @@
  *  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_RUNNERCONFIG_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 
 #include "catch_test_spec.h"
 #include "catch_context.h"
@@ -172,4 +172,4 @@ namespace Catch {
     
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED

include/internal/catch_context_impl.hpp

@@ -5,6 +5,9 @@
  *  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_runner_impl.hpp"
 
 #include "catch_context.h"
@@ -105,3 +108,5 @@ namespace Catch {
         currentContext = NULL;
     }
 }
+
+#endif // TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED

include/internal/catch_exception_translator_registry.hpp

@@ -5,8 +5,8 @@
  *  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_EXCEPTION_TRANSLATOR_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 
 #include "catch_interfaces_exception.h"
 
@@ -71,4 +71,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED

include/internal/catch_generators_impl.hpp

@@ -83,4 +83,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED

include/internal/catch_impl.hpp

@@ -5,6 +5,8 @@
  *  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_IMPL_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED
 
 // Collect all the implementation files together here
 // These are the equivalent of what would usually be cpp files
@@ -69,3 +71,5 @@ namespace Catch {
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
+
+#endif // TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED

include/internal/catch_interfaces_exception.h

@@ -5,8 +5,8 @@
  *  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_INTERFACES_EXCEPTIONS_H_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED
+#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
 
 #include <string>
 #include "catch_interfaces_registry_hub.h"
@@ -63,4 +63,4 @@ namespace Catch {
     namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ) ); }\
     static std::string INTERNAL_CATCH_UNIQUE_NAME(  catch_internal_ExceptionTranslator )( signature )
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED
+#endif // TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED

include/internal/catch_interfaces_reporter.h

@@ -5,8 +5,8 @@
  *  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_IREPORTERREGISTRY_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED
+#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
 
 #include "catch_common.h"
 #include "catch_totals.hpp"
@@ -90,4 +90,4 @@ namespace Catch
     }
 }
 
-#endif // TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED
+#endif // TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED

include/internal/catch_interfaces_runner.h

@@ -5,8 +5,8 @@
  *  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_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
-#define TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
+#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
 
 #include "catch_totals.hpp"
 
@@ -20,4 +20,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
+#endif // TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED

include/internal/catch_notimplemented_exception.hpp

@@ -29,4 +29,4 @@ namespace Catch {
     
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
+#endif // TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED

include/internal/catch_registry_hub.hpp

@@ -5,6 +5,9 @@
  *  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_REGISTRY_HUB_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED
+
 #include "catch_interfaces_registry_hub.h"
 
 #include "catch_test_case_registry_impl.hpp"
@@ -72,3 +75,5 @@ namespace Catch {
     }
 
 } // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED

include/internal/catch_resultinfo.h

@@ -5,8 +5,8 @@
  *  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_RESULT_INFO_H_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED
-#define TWOBLUECUBES_CATCH_RESULT_INFO_H_INCLUDED
+#define TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED
 
 #include <string>
 #include "catch_result_type.h"
@@ -52,4 +52,4 @@ namespace Catch {
     
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RESULT_INFO_H_INCLUDED
+#endif // TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED

include/internal/catch_resultinfo.hpp

@@ -5,8 +5,8 @@
  *  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_RESULT_INFO_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED
 
 #include "catch_resultinfo.h"
 
@@ -113,4 +113,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED

include/internal/catch_runner_impl.hpp

@@ -5,8 +5,8 @@
  *  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_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
-#define TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
 
 #include "catch_interfaces_runner.h"
 #include "catch_interfaces_reporter.h"
@@ -308,4 +308,4 @@ namespace Catch {
     
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED

include/internal/catch_running_test.hpp

@@ -5,8 +5,8 @@
  *  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_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED
-#define TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED
 
 #include "catch_test_case_info.h"
 #include "catch_section_info.hpp"
@@ -116,4 +116,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED

include/internal/catch_section_info.hpp

@@ -5,8 +5,8 @@
  *  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_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED
-#define TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED
 
 #include "catch_common.h"
 
@@ -99,4 +99,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED

include/internal/catch_test_case_info.h

@@ -5,8 +5,8 @@
  *  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_TESTCASEINFO_H_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
 #include "catch_common.h"
 
@@ -54,4 +54,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED
+#endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED

include/internal/catch_test_case_info.hpp

@@ -5,8 +5,8 @@
  *  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_TESTCASEINFO_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
 
 #include "catch_tags.hpp"
 #include "catch_test_case_info.h"
@@ -109,4 +109,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED

include/internal/catch_test_case_registry_impl.hpp

@@ -5,6 +5,9 @@
  *  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_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+
 #include "catch_test_registry.hpp"
 #include "catch_test_case_info.h"
 #include "catch_test_spec.h"
@@ -125,3 +128,5 @@ namespace Catch {
     
 } // end namespace Catch
 
+
+#endif // TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED

include/internal/catch_test_registry.hpp

@@ -5,8 +5,8 @@
  *  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_REGISTRY_HPP_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
 
 #include "catch_common.h"
 #include "catch_interfaces_testcase.h"
@@ -87,4 +87,4 @@ private:
     } \
     void INTERNAL_CATCH_UNIQUE_NAME( TestCaseMethod_catch_internal_ )::test()
 
-#endif // TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED
+#endif // TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED

include/internal/catch_test_spec.h

@@ -5,8 +5,8 @@
  *  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_TESTSPEC_H_INCLUDED
+#ifndef TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED
 
 #include "catch_test_case_info.h"
 #include "catch_tags.hpp"
@@ -161,4 +161,4 @@ namespace Catch {
 
 }
 
-#endif // TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED
+#endif // TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED

projects/XCode3/OCTest/CatchOCTestCase.h

@@ -7,6 +7,8 @@
 //
 //  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_CATCHOCTESTCASE_H_INCLUDED
+#define TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED
 
 #include "catch.hpp"
 
@@ -18,4 +20,6 @@
     TestObj* obj;
 }
 
-@end
+@end
+
+#endif // TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED

projects/XCode3/OCTest/TestObj.h

@@ -7,6 +7,8 @@
 //
 //  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_TESTOBJ_H_INCLUDED
+#define TWOBLUECUBES_TESTOBJ_H_INCLUDED
 
 #import <Cocoa/Cocoa.h>
 
@@ -19,3 +21,5 @@
 @property (nonatomic, assign ) int int_val;
 
 @end
+
+#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED

projects/XCode4/OCTest/OCTest/CatchOCTestCase.h

@@ -7,6 +7,8 @@
 //
 //  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_CATCHOCTESTCASE_H_INCLUDED
+#define TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED
 
 #include "catch.hpp"
 
@@ -18,4 +20,6 @@
     TestObj* obj;
 }
 
-@end
+@end
+
+#endif // TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED

projects/XCode4/OCTest/OCTest/TestObj.h

@@ -7,6 +7,8 @@
 //
 //  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_TESTOBJ_H_INCLUDED
+#define TWOBLUECUBES_TESTOBJ_H_INCLUDED
 
 #import <Foundation/Foundation.h>
 
@@ -22,3 +24,5 @@
 @property (nonatomic, assign ) int int_val;
 
 @end
+
+#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED

projects/XCode4/iOSTest/iOSTest/TestObj.h

@@ -7,6 +7,8 @@
 //
 //  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_TESTOBJ_H_INCLUDED
+#define TWOBLUECUBES_TESTOBJ_H_INCLUDED
 
 #import <Foundation/Foundation.h>
 
@@ -19,3 +21,5 @@
 @property (nonatomic, assign ) int int_val;
 
 @end
+
+#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED

projects/runners/iTchRunner/internal/iTchRunnerAppDelegate.h

@@ -6,6 +6,8 @@
  *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
  *
  */
+#ifndef TWOBLUECUBES_ITCHRUNNERAPPDELEGATE_H_INCLUDED
+#define TWOBLUECUBES_ITCHRUNNERAPPDELEGATE_H_INCLUDED
 
 #import "iTchRunnerMainView.h"
 
@@ -107,4 +109,6 @@
 
 
 
-@end
+@end
+
+#endif // TWOBLUECUBES_ITCHRUNNERAPPDELEGATE_H_INCLUDED

projects/runners/iTchRunner/internal/iTchRunnerMainView.h

@@ -6,6 +6,8 @@
  *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
  *
  */
+#ifndef TWOBLUECUBES_ITCHRUNNERMAINVIEW_H_INCLUDED
+#define TWOBLUECUBES_ITCHRUNNERMAINVIEW_H_INCLUDED
 
 #include "internal/catch_config.hpp"
 #include "internal/catch_runner_impl.hpp"
@@ -143,3 +145,5 @@
 
 
 @end
+
+#endif // TWOBLUECUBES_ITCHRUNNERMAINVIEW_H_INCLUDED

projects/runners/iTchRunner/internal/iTchRunnerReporter.h

@@ -6,6 +6,9 @@
  *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
  *
  */
+#ifndef TWOBLUECUBES_ITCHRUNNERREPORTER_H_INCLUDED
+#define TWOBLUECUBES_ITCHRUNNERREPORTER_H_INCLUDED
+
 #include "catch.hpp"
 
 @protocol iTchRunnerDelegate
@@ -106,3 +109,5 @@ namespace Catch
         id<iTchRunnerDelegate> m_delegate;
     };
 }
+
+#endif // TWOBLUECUBES_ITCHRUNNERREPORTER_H_INCLUDED

single_include/catch.hpp

@@ -1,5 +1,5 @@
 /*
- *  Generated: 2012-09-26 18:38:02.155253
+ *  Generated: 2012-09-26 21:42:33.317309
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -260,7 +260,7 @@ namespace Catch {
 }
 
 // #included from: internal/catch_test_registry.hpp
-#define TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
 
 // #included from: catch_interfaces_testcase.h
 #define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
@@ -645,7 +645,7 @@ inline std::string toString( std::nullptr_t ) {
 } // end namespace Catch
 
 // #included from: catch_resultinfo.h
-#define TWOBLUECUBES_CATCH_RESULT_INFO_H_INCLUDED
+#define TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED
 
 #include <string>
 // #included from: catch_result_type.h
@@ -1626,23 +1626,23 @@ using namespace Generators;
 #define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" )
 
 // #included from: internal/catch_interfaces_exception.h
-#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED
+#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
 
 #include <string>
 // #included from: catch_interfaces_registry_hub.h
 #define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
 
 // #included from: catch_interfaces_reporter.h
-#define TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED
+#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
 
 // #included from: catch_config.hpp
-#define TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 
 // #included from: catch_test_spec.h
-#define TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED
 
 // #included from: catch_test_case_info.h
-#define TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
 #include <string>
 #include <set>
@@ -2599,7 +2599,7 @@ using namespace Matchers;
 // These files are included here so the single_include script doesn't put them
 // in the conditionally compiled sections
 // #included from: internal/catch_interfaces_runner.h
-#define TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
+#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
 
 #include <string>
 
@@ -2809,6 +2809,7 @@ return @ desc; \
 
 #if defined( CATCH_CONFIG_MAIN ) || defined( CATCH_CONFIG_RUNNER )
 // #included from: internal/catch_impl.hpp
+#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED
 
 // Collect all the implementation files together here
 // These are the equivalent of what would usually be cpp files
@@ -3530,13 +3531,13 @@ namespace Catch {
 } // end namespace Catch
 
 // #included from: internal/catch_runner_impl.hpp
-#define TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
 
 // #included from: catch_running_test.hpp
-#define TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RUNNING_TEST_HPP_INCLUDED
 
 // #included from: catch_section_info.hpp
-#define TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_SECTION_INFO_HPP_INCLUDED
 
 #include <map>
 #include <string>
@@ -4271,8 +4272,10 @@ namespace Catch {
 } // end namespace Catch
 
 // #included from: catch_registry_hub.hpp
+#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED
 
 // #included from: catch_test_case_registry_impl.hpp
+#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
 #include <vector>
 #include <set>
@@ -4425,7 +4428,7 @@ namespace Catch {
 }
 
 // #included from: catch_exception_translator_registry.hpp
-#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 
 #ifdef __OBJC__
 #import "Foundation/Foundation.h"
@@ -4549,6 +4552,7 @@ namespace Catch {
     }
 
 } // end namespace Catch
+
 // #included from: catch_notimplemented_exception.hpp
 #define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED
 
@@ -4573,6 +4577,7 @@ namespace Catch {
 } // end namespace Catch
 
 // #included from: catch_context_impl.hpp
+#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
 
 namespace Catch {
 
@@ -4669,6 +4674,7 @@ namespace Catch {
         currentContext = NULL;
     }
 }
+
 // #included from: catch_console_colour_impl.hpp
 #define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
 
@@ -4863,7 +4869,7 @@ namespace Catch {
 } // end namespace Catch
 
 // #included from: catch_resultinfo.hpp
-#define TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_RESULTINFO_HPP_INCLUDED
 
 namespace Catch {
 
@@ -5023,7 +5029,7 @@ namespace Catch {
 } // end namespace Catch
 
 // #included from: catch_test_case_info.hpp
-#define TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
 
 namespace Catch {
 
@@ -6056,6 +6062,7 @@ namespace Catch {
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
+
 #endif
 
 #ifdef CATCH_CONFIG_MAIN