diff options
| author | Martin Hořeňovský | 2025-07-20 21:40:18 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2025-07-21 21:50:43 +0200 |
| commit | 8c3ffe05e1293e64c8d10bcd68092fe9de9673ff (patch) | |
| tree | 6149e88b69977fbf331f2742f06ea63bd0390b3f /src | |
| parent | 715558fd97a48533fd41cb7dddf23b05d333cec6 (diff) | |
| download | catch3-8c3ffe05e1293e64c8d10bcd68092fe9de9673ff.tar.gz | |
Skeleton for applying deprecation warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/catch2/catch_all.hpp | 1 | ||||
| -rw-r--r-- | src/catch2/catch_user_config.hpp.in | 10 | ||||
| -rw-r--r-- | src/catch2/internal/catch_deprecation_macro.hpp | 19 | ||||
| -rw-r--r-- | src/catch2/meson.build | 1 |
5 files changed, 32 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 49b2d1d1..9930c484 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -85,6 +85,7 @@ set(IMPL_HEADERS ${SOURCES_DIR}/internal/catch_debug_console.hpp ${SOURCES_DIR}/internal/catch_debugger.hpp ${SOURCES_DIR}/internal/catch_decomposer.hpp + ${SOURCES_DIR}/internal/catch_deprecation_macro.hpp ${SOURCES_DIR}/internal/catch_enforce.hpp ${SOURCES_DIR}/internal/catch_enum_values_registry.hpp ${SOURCES_DIR}/internal/catch_errno_guard.hpp diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index 0d173715..5893b590 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -66,6 +66,7 @@ #include <catch2/internal/catch_debug_console.hpp> #include <catch2/internal/catch_debugger.hpp> #include <catch2/internal/catch_decomposer.hpp> +#include <catch2/internal/catch_deprecation_macro.hpp> #include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_enum_values_registry.hpp> #include <catch2/internal/catch_errno_guard.hpp> diff --git a/src/catch2/catch_user_config.hpp.in b/src/catch2/catch_user_config.hpp.in index 3acda688..70ad24dd 100644 --- a/src/catch2/catch_user_config.hpp.in +++ b/src/catch2/catch_user_config.hpp.in @@ -187,6 +187,16 @@ #endif +#cmakedefine CATCH_CONFIG_DEPRECATION_ANNOTATIONS +#cmakedefine CATCH_CONFIG_NO_DEPRECATION_ANNOTATIONS + +#if defined( CATCH_CONFIG_DEPRECATION_ANNOTATIONS ) && \ + defined( CATCH_CONFIG_NO_DEPRECATION_ANNOTATIONS ) +# error Cannot force DEPRECATION_ANNOTATIONS to both ON and OFF +#endif + + + // ------ // Simple toggle defines // their value is never used and they cannot be overridden diff --git a/src/catch2/internal/catch_deprecation_macro.hpp b/src/catch2/internal/catch_deprecation_macro.hpp new file mode 100644 index 00000000..7834882b --- /dev/null +++ b/src/catch2/internal/catch_deprecation_macro.hpp @@ -0,0 +1,19 @@ + +// Copyright Catch2 Authors +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE.txt or copy at +// https://www.boost.org/LICENSE_1_0.txt) + +// SPDX-License-Identifier: BSL-1.0 +#ifndef CATCH_DEPRECATION_MACRO_HPP_INCLUDED +#define CATCH_DEPRECATION_MACRO_HPP_INCLUDED + +#include <catch2/catch_user_config.hpp> + +#if !defined( CATCH_CONFIG_NO_DEPRECATION_ANNOTATIONS ) +# define DEPRECATED( msg ) [[deprecated( msg )]] +#else +# define DEPRECATED( msg ) +#endif + +#endif // CATCH_DEPRECATION_MACRO_HPP_INCLUDED diff --git a/src/catch2/meson.build b/src/catch2/meson.build index 90a04f00..77aa180a 100644 --- a/src/catch2/meson.build +++ b/src/catch2/meson.build @@ -92,6 +92,7 @@ internal_headers = [ 'internal/catch_debug_console.hpp', 'internal/catch_debugger.hpp', 'internal/catch_decomposer.hpp', + 'internal/catch_deprecation_macro.hpp', 'internal/catch_enforce.hpp', 'internal/catch_enum_values_registry.hpp', 'internal/catch_errno_guard.hpp', |