[Boost-commit] svn:boost r54143 - in trunk/boost: detail functional/hash

Subject: [Boost-commit] svn:boost r54143 - in trunk/boost: detail functional/hash
From: daniel_james_at_[hidden]
Date: 2009-06-21 05:42:21

Author: danieljames
Date: 2009-06-21 05:42:20 EDT (Sun, 21 Jun 2009)
New Revision: 54143
URL: http://svn.boost.org/trac/boost/changeset/54143

Log:
Move BOOST_HASH_CHAR_TRAITS from container_fwd into the hash headers, and undefine it.
Text files modified: 
   trunk/boost/detail/container_fwd.hpp |    14 +++++++-------                          
   trunk/boost/functional/hash/hash.hpp |     8 ++++++++                                
   2 files changed, 15 insertions(+), 7 deletions(-)

Modified: trunk/boost/detail/container_fwd.hpp
==============================================================================
--- trunk/boost/detail/container_fwd.hpp	(original)
+++ trunk/boost/detail/container_fwd.hpp	2009-06-21 05:42:20 EDT (Sun, 21 Jun 2009)
@@ -13,12 +13,6 @@
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
-#define BOOST_HASH_CHAR_TRAITS string_char_traits
-#else
-#define BOOST_HASH_CHAR_TRAITS char_traits
-#endif
-
 #if ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) && defined(_GLIBCXX_DEBUG)) \
     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
@@ -65,7 +59,13 @@
 {
     template <class T> class allocator;
     template <class charT, class traits, class Allocator> class basic_string;
-    template <class charT> struct BOOST_HASH_CHAR_TRAITS;
+
+#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+    template <class charT> struct string_char_traits;
+#else
+    template <class charT> struct char_traits;
+#endif
+
     template <class T> class complex;
 }
 

Modified: trunk/boost/functional/hash/hash.hpp
==============================================================================
--- trunk/boost/functional/hash/hash.hpp	(original)
+++ trunk/boost/functional/hash/hash.hpp	2009-06-21 05:42:20 EDT (Sun, 21 Jun 2009)
@@ -21,6 +21,12 @@
 #include <boost/type_traits/is_pointer.hpp>
 #endif
 
+#if BOOST_WORKAROUND(__GNUC__, < 3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+#define BOOST_HASH_CHAR_TRAITS string_char_traits
+#else
+#define BOOST_HASH_CHAR_TRAITS char_traits
+#endif
+
 namespace boost
 {
     std::size_t hash_value(bool);
@@ -534,6 +540,8 @@
 #endif
 }
 
+#undef BOOST_HASH_CHAR_TRAITS
+
 #endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
 
 // Include this outside of the include guards in case the file is included