From bd14ee3b0cb6b2ca780bc49d89fefc23cd8ab515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Mon, 14 Sep 2015 22:39:18 +0200 Subject: [PATCH] Use newly refactored move/detail/std_fwd_xxx.hpp headers --- include/boost/interprocess/detail/std_fwd.hpp | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/include/boost/interprocess/detail/std_fwd.hpp b/include/boost/interprocess/detail/std_fwd.hpp index 098e670..e408e7d 100644 --- a/include/boost/interprocess/detail/std_fwd.hpp +++ b/include/boost/interprocess/detail/std_fwd.hpp @@ -22,26 +22,8 @@ // Standard predeclarations ////////////////////////////////////////////////////////////////////////////// -#if defined(_LIBCPP_VERSION) - #define BOOST_INTERPROCESS_CLANG_INLINE_STD_NS - #pragma GCC diagnostic push - #if defined(__clang__) - #pragma GCC diagnostic ignored "-Wc++11-extensions" - #endif - #define BOOST_INTERPROCESS_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD - #define BOOST_INTERPROCESS_STD_NS_END _LIBCPP_END_NAMESPACE_STD -#elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE_VERSION) //GCC >= 4.6 - #define BOOST_INTERPROCESS_STD_NS_BEG namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - #define BOOST_INTERPROCESS_STD_NS_END _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE) //GCC >= 4.2 - #define BOOST_INTERPROCESS_STD_NS_BEG _GLIBCXX_BEGIN_NAMESPACE(std) - #define BOOST_INTERPROCESS_STD_NS_END _GLIBCXX_END_NAMESPACE -#else - #define BOOST_INTERPROCESS_STD_NS_BEG namespace std{ - #define BOOST_INTERPROCESS_STD_NS_END } -#endif - -BOOST_INTERPROCESS_STD_NS_BEG +#include +BOOST_MOVE_STD_NS_BEG struct input_iterator_tag; struct forward_iterator_tag; @@ -57,11 +39,7 @@ class basic_ostream; template class basic_istream; -BOOST_INTERPROCESS_STD_NS_END - -#ifdef BOOST_INTERPROCESS_CLANG_INLINE_STD_NS - #pragma GCC diagnostic pop - #undef BOOST_INTERPROCESS_CLANG_INLINE_STD_NS -#endif //BOOST_INTERPROCESS_CLANG_INLINE_STD_NS +BOOST_MOVE_STD_NS_END +#include #endif //#ifndef BOOST_INTERPROCESS_DETAIL_STD_FWD_HPP