From f29c898443d65cc3fe2f040e700c64bba907288e Mon Sep 17 00:00:00 2001 From: Matt Wozniski Date: Mon, 17 Sep 2012 01:42:29 -0400 Subject: [PATCH] Normalize include guards for all *.h and *.hpp Some files had include guards that didn't match the file name, and others were missing the include guards entirely. Standardized this so that every include file has an include guard, and all the guards are of the form TWOBLUECUBES___INCLUDED --- include/internal/catch_config.hpp | 6 +-- include/internal/catch_context_impl.hpp | 5 +++ .../catch_exception_translator_registry.hpp | 6 +-- include/internal/catch_generators_impl.hpp | 2 +- include/internal/catch_impl.hpp | 4 ++ include/internal/catch_interfaces_exception.h | 6 +-- include/internal/catch_interfaces_reporter.h | 6 +-- include/internal/catch_interfaces_runner.h | 6 +-- .../catch_notimplemented_exception.hpp | 2 +- include/internal/catch_registry_hub.hpp | 5 +++ include/internal/catch_resultinfo.h | 6 +-- include/internal/catch_resultinfo.hpp | 6 +-- include/internal/catch_runner_impl.hpp | 6 +-- include/internal/catch_running_test.hpp | 6 +-- include/internal/catch_section_info.hpp | 6 +-- include/internal/catch_test_case_info.h | 6 +-- include/internal/catch_test_case_info.hpp | 6 +-- .../catch_test_case_registry_impl.hpp | 5 +++ include/internal/catch_test_registry.hpp | 6 +-- include/internal/catch_test_spec.h | 6 +-- projects/XCode3/OCTest/CatchOCTestCase.h | 6 ++- projects/XCode3/OCTest/TestObj.h | 4 ++ .../XCode4/OCTest/OCTest/CatchOCTestCase.h | 6 ++- projects/XCode4/OCTest/OCTest/TestObj.h | 4 ++ projects/XCode4/iOSTest/iOSTest/TestObj.h | 4 ++ .../internal/iTchRunnerAppDelegate.h | 6 ++- .../iTchRunner/internal/iTchRunnerMainView.h | 4 ++ .../iTchRunner/internal/iTchRunnerReporter.h | 5 +++ single_include/catch.hpp | 37 +++++++++++-------- 29 files changed, 121 insertions(+), 62 deletions(-) diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp index ca6c4eb2..9eb231c2 100644 --- a/include/internal/catch_config.hpp +++ b/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 -#define TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED +#ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED +#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED #include "catch_test_spec.h" #include "catch_context.h" @@ -173,4 +173,4 @@ namespace Catch { } // end namespace Catch -#endif // TWOBLUECUBES_CATCH_RUNNERCONFIG_HPP_INCLUDED +#endif // TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED diff --git a/include/internal/catch_context_impl.hpp b/include/internal/catch_context_impl.hpp index 0121d4e7..4efbfaa7 100644 --- a/include/internal/catch_context_impl.hpp +++ b/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 diff --git a/include/internal/catch_exception_translator_registry.hpp b/include/internal/catch_exception_translator_registry.hpp index a6102ef9..c7199b71 100644 --- a/include/internal/catch_exception_translator_registry.hpp +++ b/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 -#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_HPP_INCLUDED +#ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_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 diff --git a/include/internal/catch_generators_impl.hpp b/include/internal/catch_generators_impl.hpp index f97519fb..23304f91 100644 --- a/include/internal/catch_generators_impl.hpp +++ b/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 diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp index 9815f271..15f74f99 100644 --- a/include/internal/catch_impl.hpp +++ b/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 @@ -65,3 +67,5 @@ namespace Catch { #ifdef __clang__ #pragma clang diagnostic pop #endif + +#endif // TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED diff --git a/include/internal/catch_interfaces_exception.h b/include/internal/catch_interfaces_exception.h index 76146129..edfbf87d 100644 --- a/include/internal/catch_interfaces_exception.h +++ b/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 -#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTIONS_H_INCLUDED +#ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED +#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED #include #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 diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h index da3cf79a..bc6d586c 100644 --- a/include/internal/catch_interfaces_reporter.h +++ b/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 -#define TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED +#ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED +#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED #include "catch_common.h" #include "catch_totals.hpp" @@ -79,4 +79,4 @@ namespace Catch } } -#endif // TWOBLUECUBES_CATCH_IREPORTERREGISTRY_INCLUDED +#endif // TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED diff --git a/include/internal/catch_interfaces_runner.h b/include/internal/catch_interfaces_runner.h index 874907b6..e59d64f2 100644 --- a/include/internal/catch_interfaces_runner.h +++ b/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 -#define TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED +#ifndef TWOBLUECUBES_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 diff --git a/include/internal/catch_notimplemented_exception.hpp b/include/internal/catch_notimplemented_exception.hpp index d819cc49..b301fb1b 100644 --- a/include/internal/catch_notimplemented_exception.hpp +++ b/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 diff --git a/include/internal/catch_registry_hub.hpp b/include/internal/catch_registry_hub.hpp index 4a8e9a35..b832d54a 100644 --- a/include/internal/catch_registry_hub.hpp +++ b/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 diff --git a/include/internal/catch_resultinfo.h b/include/internal/catch_resultinfo.h index fb49649d..9badb4d3 100644 --- a/include/internal/catch_resultinfo.h +++ b/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 -#define TWOBLUECUBES_CATCH_RESULT_INFO_H_INCLUDED +#ifndef TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED +#define TWOBLUECUBES_CATCH_RESULTINFO_H_INCLUDED #include #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 diff --git a/include/internal/catch_resultinfo.hpp b/include/internal/catch_resultinfo.hpp index 8ad836d8..676f4e8f 100644 --- a/include/internal/catch_resultinfo.hpp +++ b/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 -#define TWOBLUECUBES_CATCH_RESULT_INFO_HPP_INCLUDED +#ifndef TWOBLUECUBES_CATCH_RESULTINFO_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 diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index 578d26dd..ef5ec74f 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/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 -#define TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED +#ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED +#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED #include "catch_interfaces_runner.h" #include "catch_interfaces_reporter.h" @@ -300,4 +300,4 @@ namespace Catch { } // end namespace Catch -#endif // TWOBLUECUBES_INTERNAL_CATCH_RUNNER_HPP_INCLUDED +#endif // TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED diff --git a/include/internal/catch_running_test.hpp b/include/internal/catch_running_test.hpp index 60fc4f78..3fce399e 100644 --- a/include/internal/catch_running_test.hpp +++ b/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 -#define TWOBLUECUBES_INTERNAL_CATCH_RUNNING_TEST_HPP_INCLUDED +#ifndef TWOBLUECUBES_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 diff --git a/include/internal/catch_section_info.hpp b/include/internal/catch_section_info.hpp index 396372bb..2d4d0edc 100644 --- a/include/internal/catch_section_info.hpp +++ b/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 -#define TWOBLUECUBES_INTERNAL_CATCH_SECTION_INFO_HPP_INCLUDED +#ifndef TWOBLUECUBES_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 diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h index 1aebf0cf..97857632 100644 --- a/include/internal/catch_test_case_info.h +++ b/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 -#define TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED +#ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED +#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED #include "catch_common.h" @@ -53,4 +53,4 @@ namespace Catch { }; } -#endif // TWOBLUECUBES_CATCH_TESTCASEINFO_H_INCLUDED +#endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED diff --git a/include/internal/catch_test_case_info.hpp b/include/internal/catch_test_case_info.hpp index be4db842..413c43a4 100644 --- a/include/internal/catch_test_case_info.hpp +++ b/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 -#define TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED +#ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED +#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED #include "catch_test_case_info.h" #include "catch_interfaces_testcase.h" @@ -131,4 +131,4 @@ namespace Catch { } } -#endif // TWOBLUECUBES_CATCH_TESTCASEINFO_HPP_INCLUDED +#endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED diff --git a/include/internal/catch_test_case_registry_impl.hpp b/include/internal/catch_test_case_registry_impl.hpp index ade5878d..96c5783f 100644 --- a/include/internal/catch_test_case_registry_impl.hpp +++ b/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 diff --git a/include/internal/catch_test_registry.hpp b/include/internal/catch_test_registry.hpp index b41c85e3..6a42fdbe 100644 --- a/include/internal/catch_test_registry.hpp +++ b/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 -#define TWOBLUECUBES_CATCH_REGISTRY_HPP_INCLUDED +#ifndef TWOBLUECUBES_CATCH_TEST_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 diff --git a/include/internal/catch_test_spec.h b/include/internal/catch_test_spec.h index 3a1daeec..07b0b98c 100644 --- a/include/internal/catch_test_spec.h +++ b/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 -#define TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED +#ifndef TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED +#define TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED #include "catch_test_case_info.h" @@ -142,4 +142,4 @@ namespace Catch { } -#endif // TWOBLUECUBES_CATCH_TESTSPEC_H_INCLUDED +#endif // TWOBLUECUBES_CATCH_TEST_SPEC_H_INCLUDED diff --git a/projects/XCode3/OCTest/CatchOCTestCase.h b/projects/XCode3/OCTest/CatchOCTestCase.h index 823f97aa..bd26239a 100644 --- a/projects/XCode3/OCTest/CatchOCTestCase.h +++ b/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 \ No newline at end of file +@end + +#endif // TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED diff --git a/projects/XCode3/OCTest/TestObj.h b/projects/XCode3/OCTest/TestObj.h index 26e59286..c39aaa03 100644 --- a/projects/XCode3/OCTest/TestObj.h +++ b/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 @@ -19,3 +21,5 @@ @property (nonatomic, assign ) int int_val; @end + +#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED diff --git a/projects/XCode4/OCTest/OCTest/CatchOCTestCase.h b/projects/XCode4/OCTest/OCTest/CatchOCTestCase.h index 823f97aa..bd26239a 100644 --- a/projects/XCode4/OCTest/OCTest/CatchOCTestCase.h +++ b/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 \ No newline at end of file +@end + +#endif // TWOBLUECUBES_CATCHOCTESTCASE_H_INCLUDED diff --git a/projects/XCode4/OCTest/OCTest/TestObj.h b/projects/XCode4/OCTest/OCTest/TestObj.h index be0a4141..8443921f 100644 --- a/projects/XCode4/OCTest/OCTest/TestObj.h +++ b/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 @@ -22,3 +24,5 @@ @property (nonatomic, assign ) int int_val; @end + +#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED diff --git a/projects/XCode4/iOSTest/iOSTest/TestObj.h b/projects/XCode4/iOSTest/iOSTest/TestObj.h index 388e9a8d..de672502 100644 --- a/projects/XCode4/iOSTest/iOSTest/TestObj.h +++ b/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 @@ -19,3 +21,5 @@ @property (nonatomic, assign ) int int_val; @end + +#endif // TWOBLUECUBES_TESTOBJ_H_INCLUDED diff --git a/projects/runners/iTchRunner/internal/iTchRunnerAppDelegate.h b/projects/runners/iTchRunner/internal/iTchRunnerAppDelegate.h index 4f83286d..a98b45d5 100644 --- a/projects/runners/iTchRunner/internal/iTchRunnerAppDelegate.h +++ b/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 \ No newline at end of file +@end + +#endif // TWOBLUECUBES_ITCHRUNNERAPPDELEGATE_H_INCLUDED diff --git a/projects/runners/iTchRunner/internal/iTchRunnerMainView.h b/projects/runners/iTchRunner/internal/iTchRunnerMainView.h index f4e64be2..12f9c5db 100644 --- a/projects/runners/iTchRunner/internal/iTchRunnerMainView.h +++ b/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 diff --git a/projects/runners/iTchRunner/internal/iTchRunnerReporter.h b/projects/runners/iTchRunner/internal/iTchRunnerReporter.h index eb89e85a..08bd1aac 100644 --- a/projects/runners/iTchRunner/internal/iTchRunnerReporter.h +++ b/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 m_delegate; }; } + +#endif // TWOBLUECUBES_ITCHRUNNERREPORTER_H_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index ba9a0797..2800316c 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,5 +1,5 @@ /* - * Generated: 2012-09-15 17:50:31.695760 + * Generated: 2012-09-17 01:41:39.049891 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -259,7 +259,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 @@ -644,7 +644,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 // #included from: catch_result_type.h @@ -1625,23 +1625,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 // #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 #include @@ -2306,7 +2306,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 @@ -2516,6 +2516,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 @@ -3201,13 +3202,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 #include @@ -3936,8 +3937,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 #include @@ -4090,7 +4093,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" @@ -4214,6 +4217,7 @@ namespace Catch { } } // end namespace Catch + // #included from: catch_notimplemented_exception.hpp #define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED @@ -4238,6 +4242,7 @@ namespace Catch { } // end namespace Catch // #included from: catch_context_impl.hpp +#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED // #included from: catch_stream.hpp #define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED @@ -4388,6 +4393,7 @@ namespace Catch { currentContext = NULL; } } + // #included from: catch_console_colour_impl.hpp #define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED @@ -4582,7 +4588,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 { @@ -4742,7 +4748,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 { @@ -5796,6 +5802,7 @@ namespace Catch { #ifdef __clang__ #pragma clang diagnostic pop #endif + #endif #ifdef CATCH_CONFIG_MAIN