[Boost-commit] svn:boost r52246 - in trunk/boost: config config/stdlib detail

Subject: [Boost-commit] svn:boost r52246 - in trunk/boost: config config/stdlib detail
From: daniel_james_at_[hidden]
Date: 2009-04-08 06:56:23

Author: danieljames
Date: 2009-04-08 06:56:22 EDT (Wed, 08 Apr 2009)
New Revision: 52246
URL: http://svn.boost.org/trac/boost/changeset/52246

Log:
Include <utility> for some versions of gcc's library.

Sometimes gcc's <cstddef> doesn't define the C++ macros, so check for it
and include <utility> in that case. Also remove a workaround from
container_fwd.hpp

Fixes #2924.
Text files modified: 
   trunk/boost/config/select_stdlib_config.hpp |     2 +-                                      
   trunk/boost/config/stdlib/libstdcpp3.hpp    |     4 ++++                                    
   trunk/boost/detail/container_fwd.hpp        |     3 +--                                     
   3 files changed, 6 insertions(+), 3 deletions(-)

Modified: trunk/boost/config/select_stdlib_config.hpp
==============================================================================
--- trunk/boost/config/select_stdlib_config.hpp	(original)
+++ trunk/boost/config/select_stdlib_config.hpp	2009-04-08 06:56:22 EDT (Wed, 08 Apr 2009)
@@ -33,7 +33,7 @@
 // Rogue Wave library:
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/roguewave.hpp"
 
-#elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
+#elif defined(__GLIBCPP__) || defined(__GLIBCXX__) || defined(_GLIBCXX_CSTDDEF)
 // GNU libstdc++ 3
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/libstdcpp3.hpp"
 

Modified: trunk/boost/config/stdlib/libstdcpp3.hpp
==============================================================================
--- trunk/boost/config/stdlib/libstdcpp3.hpp	(original)
+++ trunk/boost/config/stdlib/libstdcpp3.hpp	2009-04-08 06:56:22 EDT (Wed, 08 Apr 2009)
@@ -9,6 +9,10 @@
 //  config for libstdc++ v3
 //  not much to go in here:
 
+#if !defined(__GLIBCXX__) && !defined(__GLIBCPP__)
+#include <utility>
+#endif
+
 #ifdef __GLIBCXX__
 #define BOOST_STDLIB "GNU libstdc++ version " BOOST_STRINGIZE(__GLIBCXX__)
 #else

Modified: trunk/boost/detail/container_fwd.hpp
==============================================================================
--- trunk/boost/detail/container_fwd.hpp	(original)
+++ trunk/boost/detail/container_fwd.hpp	2009-04-08 06:56:22 EDT (Wed, 08 Apr 2009)
@@ -19,8 +19,7 @@
 #define BOOST_HASH_CHAR_TRAITS char_traits
 #endif
 
-#if ((defined(__GLIBCPP__) || defined(__GLIBCXX__) || defined(_GLIBCXX_CSTDDEF)) \
-        && defined(_GLIBCXX_DEBUG)) \
+#if ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) && defined(_GLIBCXX_DEBUG)) \
     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
     || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))