diff options
| author | Martin Hořeňovský | 2020-04-05 18:12:09 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-04-05 19:14:16 +0200 |
| commit | 7892954c9972259ee8b6defe6d36285b99dcda2e (patch) | |
| tree | 7b1a48db4e41efadd80f3e36e60e36890dbdcc9f | |
| parent | 54a7eb1aeddb5fca074266624d1501e854fb7e27 (diff) | |
| download | catch3-7892954c9972259ee8b6defe6d36285b99dcda2e.tar.gz | |
Remove global warning manipulation headers
They were unused except for one test file anyway.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/catch2/catch_reenable_warnings.h | 21 | ||||
| -rw-r--r-- | src/catch2/catch_suppress_warnings.h | 27 | ||||
| -rw-r--r-- | tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp | 1 |
4 files changed, 0 insertions, 51 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f06941cc..7a4bebb8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,7 +91,6 @@ set(INTERNAL_HEADERS ${SOURCES_DIR}/catch_polyfills.hpp ${SOURCES_DIR}/catch_preprocessor.hpp ${SOURCES_DIR}/catch_random_number_generator.h - ${SOURCES_DIR}/catch_reenable_warnings.h ${SOURCES_DIR}/catch_reporter_registrars.hpp ${SOURCES_DIR}/catch_reporter_registry.h ${SOURCES_DIR}/catch_result_type.h @@ -104,7 +103,6 @@ set(INTERNAL_HEADERS ${SOURCES_DIR}/catch_stream.h ${SOURCES_DIR}/catch_stringref.h ${SOURCES_DIR}/catch_string_manip.h - ${SOURCES_DIR}/catch_suppress_warnings.h ${SOURCES_DIR}/catch_tag_alias.h ${SOURCES_DIR}/catch_tag_alias_autoregistrar.h ${SOURCES_DIR}/catch_tag_alias_registry.h diff --git a/src/catch2/catch_reenable_warnings.h b/src/catch2/catch_reenable_warnings.h deleted file mode 100644 index 33574e05..00000000 --- a/src/catch2/catch_reenable_warnings.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2014 Two Blue Cubes Ltd - * - * 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_REENABLE_WARNINGS_H_INCLUDED -#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(pop) -# else -# pragma clang diagnostic pop -# endif -#elif defined __GNUC__ -# pragma GCC diagnostic pop -#endif - -#endif // TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED diff --git a/src/catch2/catch_suppress_warnings.h b/src/catch2/catch_suppress_warnings.h deleted file mode 100644 index dc8c1da2..00000000 --- a/src/catch2/catch_suppress_warnings.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2014 Two Blue Cubes Ltd - * - * 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) - */ - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(push) -# pragma warning(disable: 161 1682) -# else // __ICC -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ - // Because REQUIREs trigger GCC's -Wparentheses, and because still - // supported version of g++ have only buggy support for _Pragmas, - // Wparentheses have to be suppressed globally. -# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wpadded" -#endif diff --git a/tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp b/tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp index cafd5e41..b6b4060a 100644 --- a/tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp @@ -4,7 +4,6 @@ */ #include <catch2/catch_test_macros.hpp> -#include <catch2/catch_suppress_warnings.h> #include <catch2/catch_test_case_tracker.h> |