BOOST_JSON_ALLOW_DEPRECATED macro

boostorg · Jul 28, 2024 · 324a7eb · 324a7eb
1 parent 56f3e17
commit 324a7eb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/.drone.star b/.drone.star
@@ -27,8 +27,8 @@ def main(ctx):
   linux_cxx("UBSan Clang", "clang++-14", packages="clang-14 libstdc++-10-dev", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu2204:1", environment={'COMMENT': 'ubsan', 'B2_VARIANT': 'debug', 'B2_TOOLSET': 'clang-14', 'B2_CXXSTD': '11,14,17', 'B2_UBSAN': '1', 'B2_DEFINES': 'define=BOOST_NO_STRESS_TEST=1'}, globalenv=globalenv),
   linux_cxx("TSan", "g++-12", packages="g++-12", buildscript="drone", buildtype="boost", image="cppalliance/droneubuntu2204:1", environment={'COMMENT': 'tsan', 'B2_VARIANT': 'debug', 'B2_TOOLSET': 'gcc-12', 'B2_CXXSTD': '11,14,17', 'B2_TSAN': '1', 'B2_DEFINES': 'BOOST_NO_STRESS_TEST=1'}, globalenv=globalenv, privileged=True),
   linux_cxx("gcc 4.8 C++03 (no op)", "g++-4.8", packages="g++-4.8", image=linuxglobalimage, buildtype="boost", buildscript="drone", environment={"B2_TOOLSET": "gcc-4.8", "B2_CXXSTD": "03", 'B2_SEPARATE_BOOTSTRAP': '1'}, globalenv=globalenv),
-  linux_cxx("gcc 4.8", "g++-4.8", packages="g++-4.8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-4.8', 'B2_CXXSTD': '11', 'B2_SEPARATE_BOOTSTRAP': '1', 'DRONE_JOB_UUID': '0ade7c2cf9', 'B2_FLAGS': 'warnings=extra warnings-as-errors=on define=BOOST_ALLOW_DEPRECATED'}, globalenv=globalenv),
-  linux_cxx("gcc 4.9", "g++-4.9", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-4.9', 'B2_CXXSTD': '11', 'B2_SEPARATE_BOOTSTRAP': '1', 'DRONE_JOB_UUID': 'b1d5781111', 'B2_FLAGS': 'warnings=extra warnings-as-errors=on define=BOOST_ALLOW_DEPRECATED'}, globalenv=globalenv),
+  linux_cxx("gcc 4.8", "g++-4.8", packages="g++-4.8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-4.8', 'B2_CXXSTD': '11', 'B2_SEPARATE_BOOTSTRAP': '1', 'DRONE_JOB_UUID': '0ade7c2cf9', 'B2_FLAGS': 'warnings=extra warnings-as-errors=on define=BOOST_JSON_ALLOW_DEPRECATED'}, globalenv=globalenv),
+  linux_cxx("gcc 4.9", "g++-4.9", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-4.9', 'B2_CXXSTD': '11', 'B2_SEPARATE_BOOTSTRAP': '1', 'DRONE_JOB_UUID': 'b1d5781111', 'B2_FLAGS': 'warnings=extra warnings-as-errors=on define=BOOST_JSON_ALLOW_DEPRECATED'}, globalenv=globalenv),
   linux_cxx("gcc 5", "g++-5", packages="g++-5", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-5', 'B2_CXXSTD': '11', 'DRONE_JOB_UUID': '17ba079149'}, globalenv=globalenv),
   linux_cxx("gcc 6", "g++-6", packages="g++-6", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-6', 'B2_CXXSTD': '11,14', 'DRONE_JOB_UUID': '7b52009b64'}, globalenv=globalenv),
   linux_cxx("gcc 7", "g++-7", packages="g++-7", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-7', 'B2_CXXSTD': '14,17', 'DRONE_JOB_UUID': 'bd307a3ec3'}, globalenv=globalenv),

diff --git a/include/boost/json/detail/config.hpp b/include/boost/json/detail/config.hpp
@@ -217,8 +217,20 @@ constexpr T static_const<T>::value;
 } // namespace json
 } // namespace boost
 
-#if defined(BOOST_GCC) && BOOST_GCC < 50000 && !defined(BOOST_ALLOW_DEPRECATED)
-# pragma GCC warning "Support for GCC versions below 5.0 is deprecated and will stop in Boost 1.88.0. To suppress this message define macro BOOST_ALLOW_DEPRECATED."
+#ifndef BOOST_JSON_ALLOW_DEPRECATED
+# ifdef BOOST_ALLOW_DEPRECATED
+#  define BOOST_JSON_ALLOW_DEPRECATED
+# endif
+#endif
+
+#if defined(BOOST_GCC) && BOOST_GCC < 50000 && !defined(BOOST_JSON_ALLOW_DEPRECATED)
+# pragma GCC warning "Support for GCC versions below 5.0 is deprecated and will stop in Boost 1.88.0. To suppress this message define macro BOOST_JSON_ALLOW_DEPRECATED."
+#endif
+
+#ifndef BOOST_JSON_ALLOW_DEPRECATED
+# define BOOST_JSON_DEPRECATED(x) BOOST_DEPRECATED(x)
+#else
+# define BOOST_JSON_DEPRECATED(x)
 #endif
 
 #endif
diff --git a/include/boost/json/memory_resource.hpp b/include/boost/json/memory_resource.hpp
@@ -27,7 +27,7 @@ namespace json {
     completely in version 1.87.0.
 */
 typedef boost::container::pmr::memory_resource
-    BOOST_DEPRECATED("Use boost::container::pmr::memory_resource instead")
+    BOOST_JSON_DEPRECATED("Use boost::container::pmr::memory_resource instead")
     memory_resource;
 
 /** The type of polymorphic allocator used by the library.
@@ -41,7 +41,7 @@ template<class T>
 using
     polymorphic_allocator
 #ifndef BOOST_MSVC
-    BOOST_DEPRECATED("Use boost::container::pmr::polymorphic_allocator instead")
+    BOOST_JSON_DEPRECATED("Use boost::container::pmr::polymorphic_allocator instead")
 #endif
     = boost::container::pmr::polymorphic_allocator<T>;
 

diff --git a/include/boost/json/system_error.hpp b/include/boost/json/system_error.hpp
@@ -29,7 +29,7 @@ namespace json {
     code. It will be removed completely in version 1.87.0.
 */
 typedef boost::system::error_code
-    BOOST_DEPRECATED("Use boost::system::error_code instead")
+    BOOST_JSON_DEPRECATED("Use boost::system::error_code instead")
     error_code;
 
 /** The type of error category used by the library.
@@ -39,7 +39,7 @@ typedef boost::system::error_code
     code. It will be removed completely in version 1.87.0.
 */
 typedef boost::system::error_category
-    BOOST_DEPRECATED("Use boost::system::error_category instead")
+    BOOST_JSON_DEPRECATED("Use boost::system::error_category instead")
     error_category;
 
 /** The type of error condition used by the library.
@@ -50,7 +50,7 @@ typedef boost::system::error_category
     completely in version 1.87.0.
 */
 typedef boost::system::error_condition
-    BOOST_DEPRECATED("Use boost::system::error_condition instead")
+    BOOST_JSON_DEPRECATED("Use boost::system::error_condition instead")
     error_condition;
 
 /** The type of system error thrown by the library.
@@ -60,7 +60,7 @@ typedef boost::system::error_condition
     code. It will be removed completely in version 1.87.0.
 */
 typedef boost::system::system_error
-    BOOST_DEPRECATED("Use boost::system::system_error instead")
+    BOOST_JSON_DEPRECATED("Use boost::system::system_error instead")
     system_error;
 
 /** The type of result returned by library functions
@@ -130,7 +130,7 @@ template< class T >
 using
     result
 #ifndef BOOST_MSVC
-    BOOST_DEPRECATED("Use boost::system::result instead")
+    BOOST_JSON_DEPRECATED("Use boost::system::result instead")
 #endif
     = boost::system::result<T>;