From 88b4cf09d9d96ca26f46d8ef2acfc73b8026fc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Tue, 4 Jan 2022 16:29:59 +0100
Subject: [PATCH] Forward declare Dinkumware Stdlib's "struct _Nil" in
 is_pair.hpp instead of pair.hpp

---
 include/boost/container/detail/is_pair.hpp |  8 ++++++++
 include/boost/container/detail/pair.hpp    | 14 +-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/include/boost/container/detail/is_pair.hpp b/include/boost/container/detail/is_pair.hpp
index e208a5c..239e36e 100644
--- a/include/boost/container/detail/is_pair.hpp
+++ b/include/boost/container/detail/is_pair.hpp
@@ -25,6 +25,14 @@
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/detail/std_fwd.hpp>
 
+#if defined(BOOST_MSVC) && (_CPPLIB_VER == 520)
+//MSVC 2010 tuple marker
+namespace std { namespace tr1 { struct _Nil; }}
+#elif defined(BOOST_MSVC) && (_CPPLIB_VER == 540)
+//MSVC 2012 tuple marker
+namespace std { struct _Nil; }
+#endif
+
 namespace boost {
 namespace tuples {
 
diff --git a/include/boost/container/detail/pair.hpp b/include/boost/container/detail/pair.hpp
index 89b7876..1537cf7 100644
--- a/include/boost/container/detail/pair.hpp
+++ b/include/boost/container/detail/pair.hpp
@@ -77,19 +77,7 @@ struct is_tuple_null<boost::tuples::null_type>
    static const bool value = true;
 };
 
-}}}
-
-#if defined(BOOST_MSVC) && (_CPPLIB_VER == 520)
-//MSVC 2010 tuple marker
-namespace std { namespace tr1 { struct _Nil; }}
-#elif defined(BOOST_MSVC) && (_CPPLIB_VER == 540)
-//MSVC 2012 tuple marker
-namespace std { struct _Nil; }
-#endif
-
-
-namespace boost {
-namespace container {
+}  //namespace detail {
 
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED