[Boost-commit] svn:boost r76339 - in branches/release: boost boost/config boost/config/compiler boost/config/stdlib libs/config

Subject: [Boost-commit] svn:boost r76339 - in branches/release: boost boost/config boost/config/compiler boost/config/stdlib libs/config
From: john_at_[hidden]
Date: 2012-01-07 12:29:05

Author: johnmaddock
Date: 2012-01-07 12:29:04 EST (Sat, 07 Jan 2012)
New Revision: 76339
URL: http://svn.boost.org/trac/boost/changeset/76339

Log:
Merge config changes from Trunk.
Properties modified: 
   branches/release/boost/config/   (props changed)
   branches/release/boost/config.hpp   (props changed)
   branches/release/boost/current_function.hpp   (props changed)
   branches/release/libs/config/   (props changed)
Text files modified: 
   branches/release/boost/config/compiler/intel.hpp    |    11 +++++++++++                             
   branches/release/boost/config/compiler/pgi.hpp      |     5 +----                                   
   branches/release/boost/config/stdlib/dinkumware.hpp |     2 +-                                      
   branches/release/boost/config/stdlib/libstdcpp3.hpp |     3 ++-                                     
   4 files changed, 15 insertions(+), 6 deletions(-)

Modified: branches/release/boost/config/compiler/intel.hpp
==============================================================================
--- branches/release/boost/config/compiler/intel.hpp	(original)
+++ branches/release/boost/config/compiler/intel.hpp	2012-01-07 12:29:04 EST (Sat, 07 Jan 2012)
@@ -236,6 +236,17 @@
 //#  undef  BOOST_NO_SCOPED_ENUMS 
 #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)
 //
 // fenv.h appears not to work with Intel prior to 12.0:

Modified: branches/release/boost/config/compiler/pgi.hpp
==============================================================================
--- branches/release/boost/config/compiler/pgi.hpp	(original)
+++ branches/release/boost/config/compiler/pgi.hpp	2012-01-07 12:29:04 EST (Sat, 07 Jan 2012)
@@ -8,7 +8,7 @@
 //  PGI C++ compiler setup:
 
 #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:
@@ -16,9 +16,6 @@
 // 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
 
 // options requested by configure --enable-test

Modified: branches/release/boost/config/stdlib/dinkumware.hpp
==============================================================================
--- branches/release/boost/config/stdlib/dinkumware.hpp	(original)
+++ branches/release/boost/config/stdlib/dinkumware.hpp	2012-01-07 12:29:04 EST (Sat, 07 Jan 2012)
@@ -109,7 +109,7 @@
 #  define BOOST_NO_NUMERIC_LIMITS_LOWEST
 #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
 #endif
 //

Modified: branches/release/boost/config/stdlib/libstdcpp3.hpp
==============================================================================
--- branches/release/boost/config/stdlib/libstdcpp3.hpp	(original)
+++ branches/release/boost/config/stdlib/libstdcpp3.hpp	2012-01-07 12:29:04 EST (Sat, 07 Jan 2012)
@@ -33,7 +33,8 @@
 
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  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
       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT