diff --git a/include/boost/system/detail/config.hpp b/include/boost/system/detail/config.hpp index ab1f304..5742a94 100644 --- a/include/boost/system/detail/config.hpp +++ b/include/boost/system/detail/config.hpp @@ -48,15 +48,4 @@ # define BOOST_SYSTEM_CONSTEXPR #endif -// BOOST_SYSTEM_REQUIRE_CONST_INIT - -#define BOOST_SYSTEM_REQUIRE_CONST_INIT - -#if defined(__has_cpp_attribute) -#if __has_cpp_attribute(clang::require_constant_initialization) -# undef BOOST_SYSTEM_REQUIRE_CONST_INIT -# define BOOST_SYSTEM_REQUIRE_CONST_INIT [[clang::require_constant_initialization]] -#endif -#endif - #endif // BOOST_SYSTEM_DETAIL_CONFIG_HPP_INCLUDED diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp index 4ad8bc6..4131ee9 100644 --- a/include/boost/system/error_code.hpp +++ b/include/boost/system/error_code.hpp @@ -331,12 +331,12 @@ namespace detail template struct BOOST_SYMBOL_VISIBLE cat_holder { - BOOST_SYSTEM_REQUIRE_CONST_INIT static constexpr system_error_category system_category_instance{}; - BOOST_SYSTEM_REQUIRE_CONST_INIT static constexpr generic_error_category generic_category_instance{}; + static constexpr system_error_category system_category_instance{}; + static constexpr generic_error_category generic_category_instance{}; }; -template BOOST_SYSTEM_REQUIRE_CONST_INIT constexpr system_error_category cat_holder::system_category_instance; -template BOOST_SYSTEM_REQUIRE_CONST_INIT constexpr generic_error_category cat_holder::generic_category_instance; +template constexpr system_error_category cat_holder::system_category_instance; +template constexpr generic_error_category cat_holder::generic_category_instance; } // namespace detail