diff --git a/BaseLib/ConfigTree.h b/BaseLib/ConfigTree.h index e4cfe1825e38bab7529ae413dd4796dda2db002f..b56d15010d2e3d0a76628ad936f5d7f492356425 100644 --- a/BaseLib/ConfigTree.h +++ b/BaseLib/ConfigTree.h @@ -545,12 +545,7 @@ private: * * This method only acts as a helper method and throws std::runtime_error. */ -#if defined(_MSC_VER) && _MSC_VER < 1500 - __declspec(noreturn) -#else - [[noreturn]] -#endif - void error(std::string const& message) const; + [[noreturn]] void error(std::string const& message) const; //! Called for printing warning messages. Will call the warning callback. //! This method only acts as a helper method. diff --git a/BaseLib/Error.h b/BaseLib/Error.h index 05d5dd78e8e8ebc7fe9576b3881a6c668ec0648e..e563d4b90179f97151170c03a09f0bc24278f0d0 100644 --- a/BaseLib/Error.h +++ b/BaseLib/Error.h @@ -19,11 +19,7 @@ namespace BaseLib namespace detail { template <typename Msg> -#if defined(_MSC_VER) && _MSC_VER < 1500 -__declspec(noreturn) -#else [[noreturn]] -#endif bool error_impl(Msg&& msg) { ERR("%s", msg.data()); @@ -43,11 +39,7 @@ namespace BaseLib namespace detail { template <typename Msg> -#if defined(_MSC_VER) && _MSC_VER < 1500 -__declspec(noreturn) -#else [[noreturn]] -#endif bool error_impl(Msg&& msg) { throw std::runtime_error(std::forward<Msg>(msg));