From 6fd1452c2b62449e684a6c29e17499f3365ceb2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Mon, 14 Sep 2015 22:37:37 +0200
Subject: [PATCH] Use newly refactored move/detail/std_fwd_xxx.hpp headers

---
 include/boost/intrusive/detail/std_fwd.hpp | 30 +++-------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/include/boost/intrusive/detail/std_fwd.hpp b/include/boost/intrusive/detail/std_fwd.hpp
index 4b5cedb..8193ea8 100644
--- a/include/boost/intrusive/detail/std_fwd.hpp
+++ b/include/boost/intrusive/detail/std_fwd.hpp
@@ -23,26 +23,8 @@
 //                        Standard predeclarations
 //////////////////////////////////////////////////////////////////////////////
 
-#if defined(_LIBCPP_VERSION)
-   #define BOOST_INTRUSIVE_CLANG_INLINE_STD_NS
-   #pragma GCC diagnostic push
-   #if defined(__clang__)
-      #pragma GCC diagnostic ignored "-Wc++11-extensions"
-   #endif
-   #define BOOST_INTRUSIVE_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
-   #define BOOST_INTRUSIVE_STD_NS_END _LIBCPP_END_NAMESPACE_STD
-#elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE_VERSION)  //GCC >= 4.6
-   #define BOOST_INTRUSIVE_STD_NS_BEG namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION 
-   #define BOOST_INTRUSIVE_STD_NS_END _GLIBCXX_END_NAMESPACE_VERSION  } // namespace
-#elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE)  //GCC >= 4.2
-   #define BOOST_INTRUSIVE_STD_NS_BEG _GLIBCXX_BEGIN_NAMESPACE(std)
-   #define BOOST_INTRUSIVE_STD_NS_END _GLIBCXX_END_NAMESPACE
-#else
-   #define BOOST_INTRUSIVE_STD_NS_BEG namespace std{
-   #define BOOST_INTRUSIVE_STD_NS_END }
-#endif
-
-BOOST_INTRUSIVE_STD_NS_BEG
+#include <boost/move/detail/std_ns_begin.hpp>
+BOOST_MOVE_STD_NS_BEG
 
 template<class T>
 struct less;
@@ -55,11 +37,7 @@ struct forward_iterator_tag;
 struct bidirectional_iterator_tag;
 struct random_access_iterator_tag;
 
-BOOST_INTRUSIVE_STD_NS_END
-
-#ifdef BOOST_INTRUSIVE_CLANG_INLINE_STD_NS
-   #pragma GCC diagnostic pop
-   #undef BOOST_INTRUSIVE_CLANG_INLINE_STD_NS
-#endif   //BOOST_INTRUSIVE_CLANG_INLINE_STD_NS
+BOOST_MOVE_STD_NS_END
+#include <boost/move/detail/std_ns_end.hpp>
 
 #endif //#ifndef BOOST_INTRUSIVE_DETAIL_STD_FWD_HPP