boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 05:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward declare Dinkumware Stdlib's "struct _Nil" in is_pair.hpp instead of pair.hpp

Browse Source
This commit is contained in:
Ion Gaztañaga
2022-01-04 16:29:59 +01:00
parent 237c27a39f
commit 88b4cf09d9
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/container/detail/is_pair.hpp
View File

@@ -25,6 +25,14 @@
#include <boost/container/detail/workaround.hpp> #include <boost/container/detail/workaround.hpp>
#include <boost/container/detail/std_fwd.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 boost {
namespace tuples { namespace tuples {

14
include/boost/container/detail/pair.hpp
View File

@@ -77,19 +77,7 @@ struct is_tuple_null<boost::tuples::null_type>
static const bool value = true; static const bool value = true;
}; };
}}} } //namespace detail {
#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 {
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED