feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Use predef for detecting piecewise construction

Browse Source 
And detect it for recent dinkumware.
This commit is contained in:
Daniel James
2017-12-19 12:11:36 +00:00
parent 6327d174d2
commit f99dee1917
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/unordered/detail/fwd.hpp
View File

@ -11,6 +11,8 @@
#pragma once #pragma once
#endif #endif
#include <boost/predef.h>
#if defined(BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT) #if defined(BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT)
// Already defined. // Already defined.
#elif defined(BOOST_LIBSTDCXX11) #elif defined(BOOST_LIBSTDCXX11)
@ -18,16 +20,19 @@
#if BOOST_LIBSTDCXX_VERSION > 40600 #if BOOST_LIBSTDCXX_VERSION > 40600
#define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1
#endif #endif
#elif defined(_LIBCPP_VERSION) #elif BOOST_LIB_STD_CXX
// https://github.com/llvm-mirror/libcxx/blob/release_30/include/utility#L206 // https://github.com/llvm-mirror/libcxx/blob/release_30/include/utility#L206
#if _LIBCPP_VERSION >= 3000 #if BOOST_LIB_STD_CXX >= BOOST_VERSION_NUMBER(3, 0, 0)
#define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1
#endif #endif
#elif defined(BOOST_MSVC) #elif defined(BOOST_LIB_STD_DINKUMWARE)
// Apparently C++11 standard supported in Visual Studio 2012 // Apparently C++11 standard supported in Visual Studio 2012
// https://msdn.microsoft.com/en-us/library/hh567368.aspx#stl // https://msdn.microsoft.com/en-us/library/hh567368.aspx#stl
// 2012 = VC+11 = BOOST_MSVC 1700 Hopefully! // 2012 = VC+11 = BOOST_MSVC 1700 Hopefully!
#if BOOST_MSVC >= 1700 // I have no idea when Dinkumware added it, probably a lot
// earlier than this check.
#if BOOST_LIB_STD_DINKUMWARE >= BOOST_VERSION_NUMBER(6, 50, 0) || \
BOOST_COMP_MSVC >= BOOST_VERSION_NUMBER(17, 0, 0)
#define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1 #define BOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT 1
#endif #endif
#endif #endif

1
include/boost/unordered/detail/implementation.hpp
View File

@ -17,7 +17,6 @@
#include <boost/detail/select_type.hpp> #include <boost/detail/select_type.hpp>
#include <boost/limits.hpp> #include <boost/limits.hpp>
#include <boost/move/move.hpp> #include <boost/move/move.hpp>
#include <boost/predef.h>
#include <boost/preprocessor/arithmetic/inc.hpp> #include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/repetition/enum.hpp> #include <boost/preprocessor/repetition/enum.hpp>