feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Merge config changes from Trunk.

Browse Source 
[SVN r76339]
This commit is contained in:
John Maddock
2012-01-07 17:29:04 +00:00
parent 3b7ff73e9d
commit 6f18ead6db
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/config/compiler/intel.hpp
View File

@ -236,6 +236,17 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
//# undef BOOST_NO_SCOPED_ENUMS //# undef BOOST_NO_SCOPED_ENUMS
#endif #endif
#if defined(_MSC_VER) && (_MSC_VER <= 1700)
//
// Although the Intel compiler is capable of supporting these, it appears not to in MSVC compatibility mode:
//
# define BOOST_NO_INITIALIZER_LISTS
# define BOOST_NO_VARIADIC_TEMPLATES
# define BOOST_NO_DELETED_FUNCTIONS
# define BOOST_NO_DEFAULTED_FUNCTIONS
# define BOOST_NO_TEMPLATE_ALIASES
#endif
#if (BOOST_INTEL_CXX_VERSION < 1200) #if (BOOST_INTEL_CXX_VERSION < 1200)
// //
// fenv.h appears not to work with Intel prior to 12.0: // fenv.h appears not to work with Intel prior to 12.0:

5
include/boost/config/compiler/pgi.hpp
View File

@ -8,7 +8,7 @@
// PGI C++ compiler setup: // PGI C++ compiler setup:
#define BOOST_COMPILER_VERSION __PGIC__##__PGIC_MINOR__ #define BOOST_COMPILER_VERSION __PGIC__##__PGIC_MINOR__
#define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(_COMPILER_VERSION) #define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
// //
// Threading support: // Threading support:
@ -16,9 +16,6 @@
// if no threading API is detected. // if no threading API is detected.
// //
// PGI 10.x doesn't seem to define __PGIC__
// versions earlier than 10.x do define __PGIC__
#if __PGIC__ >= 10 #if __PGIC__ >= 10
// options requested by configure --enable-test // options requested by configure --enable-test

2
include/boost/config/stdlib/dinkumware.hpp
View File

@ -109,7 +109,7 @@
# define BOOST_NO_NUMERIC_LIMITS_LOWEST # define BOOST_NO_NUMERIC_LIMITS_LOWEST
#endif #endif
#if !defined(_HAS_TR1_IMPORTS) && !defined(BOOST_NO_0X_HDR_TUPLE) #if (!defined(_HAS_TR1_IMPORTS) || (_HAS_TR1_IMPORTS+0 == 0)) && !defined(BOOST_NO_0X_HDR_TUPLE)
# define BOOST_NO_0X_HDR_TUPLE # define BOOST_NO_0X_HDR_TUPLE
#endif #endif
// //

3
include/boost/config/stdlib/libstdcpp3.hpp
View File

@ -33,7 +33,8 @@
#ifdef __GLIBCXX__ // gcc 3.4 and greater: #ifdef __GLIBCXX__ // gcc 3.4 and greater:
# if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
|| defined(_GLIBCXX__PTHREADS) || defined(_GLIBCXX__PTHREADS) \
|| defined(_GLIBCXX_HAS_GTHREADS)
// //
// If the std lib has thread support turned on, then turn it on in Boost // If the std lib has thread support turned on, then turn it on in Boost
// as well. We do this because some gcc-3.4 std lib headers define _REENTANT // as well. We do this because some gcc-3.4 std lib headers define _REENTANT