diff --git a/include/boost/process/detail/child_decl.hpp b/include/boost/process/detail/child_decl.hpp index 5540403f..452295a0 100644 --- a/include/boost/process/detail/child_decl.hpp +++ b/include/boost/process/detail/child_decl.hpp @@ -128,7 +128,7 @@ public: #if !defined(BOOST_PROCESS_NO_DEPRECATED) template< class Rep, class Period > - BOOST_PROCESS_DEPRECATED("wait_for is unreliable") + BOOST_DEPRECATED("wait_for is unreliable") bool wait_for (const std::chrono::duration& rel_time) { std::error_code ec; @@ -138,7 +138,7 @@ public: } template< class Clock, class Duration > - BOOST_PROCESS_DEPRECATED("wait_until is unreliable") + BOOST_DEPRECATED("wait_until is unreliable") bool wait_until(const std::chrono::time_point& timeout_time ) { std::error_code ec; @@ -185,14 +185,14 @@ public: #if !defined(BOOST_PROCESS_NO_DEPRECATED) template< class Rep, class Period > - BOOST_PROCESS_DEPRECATED("wait_for is unreliable") + BOOST_DEPRECATED("wait_for is unreliable") bool wait_for (const std::chrono::duration& rel_time, std::error_code & ec) noexcept { return wait_until(std::chrono::steady_clock::now() + rel_time, ec); } template< class Clock, class Duration > - BOOST_PROCESS_DEPRECATED("wait_until is unreliable") + BOOST_DEPRECATED("wait_until is unreliable") bool wait_until(const std::chrono::time_point& timeout_time, std::error_code & ec) noexcept { if (!_exited()) diff --git a/include/boost/process/detail/config.hpp b/include/boost/process/detail/config.hpp index 36d89819..646daa09 100644 --- a/include/boost/process/detail/config.hpp +++ b/include/boost/process/detail/config.hpp @@ -118,21 +118,4 @@ template<> constexpr wchar_t space_sign () {return L' '; } } } - -#if defined(__clang__) -# define BOOST_PROCESS_DEPRECATED(msg) __attribute__((deprecated(msg))) -#elif defined(__GNUC__) -# if __GNUC__ * 100 + __GNUC_MINOR__ >= 405 -# define BOOST_PROCESS_DEPRECATED(msg) __attribute__((deprecated(msg))) -# else -# define BOOST_PROCESS_DEPRECATED(msg) __attribute__((deprecated)) -# endif -#elif defined(_MSC_VER) -# define BOOST_PROCESS_DEPRECATED(msg) __declspec(deprecated(msg)) -#elif defined(__sun) -# define BOOST_PROCESS_DEPRECATED(msg) __attribute__((deprecated(msg))) -#else -# define BOOST_PROCESS_DEPRECATED(msg) -#endif - #endif diff --git a/include/boost/process/group.hpp b/include/boost/process/group.hpp index ff219203..7487f86f 100644 --- a/include/boost/process/group.hpp +++ b/include/boost/process/group.hpp @@ -126,7 +126,7 @@ public: /** Wait for the process group to exit for period of time. * \return True if all child processes exited while waiting.*/ template< class Rep, class Period > - BOOST_PROCESS_DEPRECATED("wait_for is unreliable") + BOOST_DEPRECATED("wait_for is unreliable") bool wait_for (const std::chrono::duration& rel_time) { return boost::process::detail::api::wait_for(_group_handle, rel_time); @@ -134,7 +134,7 @@ public: /** \overload bool wait_for(const std::chrono::duration& timeout_time ) */ template< class Rep, class Period > - BOOST_PROCESS_DEPRECATED("wait_for is unreliable") + BOOST_DEPRECATED("wait_for is unreliable") bool wait_for (const std::chrono::duration& rel_time, std::error_code & ec) noexcept { return boost::process::detail::api::wait_for(_group_handle, rel_time, ec); @@ -143,14 +143,14 @@ public: /** Wait for the process group to exit until a point in time. * \return True if all child processes exited while waiting.*/ template< class Clock, class Duration > - BOOST_PROCESS_DEPRECATED("wait_until is unreliable") + BOOST_DEPRECATED("wait_until is unreliable") bool wait_until(const std::chrono::time_point& timeout_time ) { return boost::process::detail::api::wait_until(_group_handle, timeout_time); } /** \overload bool wait_until(const std::chrono::time_point& timeout_time ) */ template< class Clock, class Duration > - BOOST_PROCESS_DEPRECATED("wait_until is unreliable") + BOOST_DEPRECATED("wait_until is unreliable") bool wait_until(const std::chrono::time_point& timeout_time, std::error_code & ec) noexcept { return boost::process::detail::api::wait_until(_group_handle, timeout_time, ec);