diff options
| author | Matt Wozniski | 2012-09-17 01:42:29 -0400 |
|---|---|---|
| committer | Matt Wozniski | 2012-09-17 01:53:39 -0400 |
| commit | f29c898443d65cc3fe2f040e700c64bba907288e (patch) | |
| tree | 359dc25f686e2204fd169dd6983fbcdc2ee65c84 /include/internal | |
| parent | fc1baac7f591e7d161fb7f2f30db33da51f94cb6 (diff) | |
| download | catch3-f29c898443d65cc3fe2f040e700c64bba907288e.tar.gz | |
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_<FILENAME>_<EXT>_INCLUDED
Diffstat (limited to 'include/internal')
20 files changed, 63 insertions, 44 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 <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 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 <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 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 |