diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
| commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
| tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /boost/tr1/detail/config.hpp | |
| parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
| download | boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.gz boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.bz2 boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.zip | |
Imported Upstream version 1.57.0upstream/1.57.0
Diffstat (limited to 'boost/tr1/detail/config.hpp')
| -rw-r--r-- | boost/tr1/detail/config.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/boost/tr1/detail/config.hpp b/boost/tr1/detail/config.hpp index 1b95148bb0..42069dd257 100644 --- a/boost/tr1/detail/config.hpp +++ b/boost/tr1/detail/config.hpp @@ -9,6 +9,7 @@ #include <cstddef> #if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \ + || (!defined(__FreeBSD__) && defined(__GNUC__)) \ || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800)) // Disable use of #include_next on Linux as typically we are installed in a // directory that is searched *after* the std lib include path. @@ -48,7 +49,7 @@ #define BOOST_TR1_HEADER(name) <BOOST_TR1_PATH(name)> // Can't use BOOST_WORKAROUND here, it leads to recursive includes: -#if (defined(__BORLANDC__) && (__BORLANDC__ <= 0x600)) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(__BORLANDC__) && (__BORLANDC__ <= 0x600)) # define BOOST_TR1_USE_OLD_TUPLE #endif @@ -137,7 +138,7 @@ // this here, in addition the feature pack for VC9 // provides a more or less full TR1 implementation: // -# if defined(_HAS_TR1) && (_HAS_TR1 + 0) +# if (defined(_HAS_TR1) && (_HAS_TR1 + 0)) || (_CPPLIB_VER >= 540) # define BOOST_HAS_TR1_ARRAY # define BOOST_HAS_TR1_REFERENCE_WRAPPER # define BOOST_HAS_TR1_RESULT_OF @@ -159,6 +160,9 @@ # if _MSC_VER >= 1600 # define BOOST_HAS_CPP_0X # endif +# if _MSC_VER >= 1700 +# define BOOST_HAS_TR1_COMPLEX_OVERLOADS +# endif #endif #include <boost/config.hpp> |