mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-25 23:06:10 +01:00
Remove global warning manipulation headers
They were unused except for one test file anyway.
This commit is contained in:
parent
54a7eb1aed
commit
7892954c99
@ -91,7 +91,6 @@ set(INTERNAL_HEADERS
|
|||||||
${SOURCES_DIR}/catch_polyfills.hpp
|
${SOURCES_DIR}/catch_polyfills.hpp
|
||||||
${SOURCES_DIR}/catch_preprocessor.hpp
|
${SOURCES_DIR}/catch_preprocessor.hpp
|
||||||
${SOURCES_DIR}/catch_random_number_generator.h
|
${SOURCES_DIR}/catch_random_number_generator.h
|
||||||
${SOURCES_DIR}/catch_reenable_warnings.h
|
|
||||||
${SOURCES_DIR}/catch_reporter_registrars.hpp
|
${SOURCES_DIR}/catch_reporter_registrars.hpp
|
||||||
${SOURCES_DIR}/catch_reporter_registry.h
|
${SOURCES_DIR}/catch_reporter_registry.h
|
||||||
${SOURCES_DIR}/catch_result_type.h
|
${SOURCES_DIR}/catch_result_type.h
|
||||||
@ -104,7 +103,6 @@ set(INTERNAL_HEADERS
|
|||||||
${SOURCES_DIR}/catch_stream.h
|
${SOURCES_DIR}/catch_stream.h
|
||||||
${SOURCES_DIR}/catch_stringref.h
|
${SOURCES_DIR}/catch_stringref.h
|
||||||
${SOURCES_DIR}/catch_string_manip.h
|
${SOURCES_DIR}/catch_string_manip.h
|
||||||
${SOURCES_DIR}/catch_suppress_warnings.h
|
|
||||||
${SOURCES_DIR}/catch_tag_alias.h
|
${SOURCES_DIR}/catch_tag_alias.h
|
||||||
${SOURCES_DIR}/catch_tag_alias_autoregistrar.h
|
${SOURCES_DIR}/catch_tag_alias_autoregistrar.h
|
||||||
${SOURCES_DIR}/catch_tag_alias_registry.h
|
${SOURCES_DIR}/catch_tag_alias_registry.h
|
||||||
|
@ -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
|
|
@ -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
|
|
@ -4,7 +4,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <catch2/catch_test_macros.hpp>
|
#include <catch2/catch_test_macros.hpp>
|
||||||
#include <catch2/catch_suppress_warnings.h>
|
|
||||||
#include <catch2/catch_test_case_tracker.h>
|
#include <catch2/catch_test_case_tracker.h>
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user