From 65a58553fbcf8ea87abba23ac2bf89a09e60f979 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 11 Apr 2009 08:49:33 +0000 Subject: [PATCH] Merge quickbook and hash changelogs. Tweak gcc detection in container_fwd.hpp Merged revisions 52084,52245-52246,52304,52320,52323 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r52084 | danieljames | 2009-03-31 20:43:58 +0100 (Tue, 31 Mar 2009) | 1 line Changelog for unordered and hash. ........ r52245 | danieljames | 2009-04-08 06:51:31 +0100 (Wed, 08 Apr 2009) | 5 lines Detect gcc stdlib for gcc 4.0.1. For some reason the normal macros aren't defined for the standard library that comes with gcc 4.0.1 (although maybe just on BSDs?). So try to detect the library for that compiler. ........ r52246 | danieljames | 2009-04-08 11:56:22 +0100 (Wed, 08 Apr 2009) | 7 lines Include for some versions of gcc's library. Sometimes gcc's doesn't define the C++ macros, so check for it and include in that case. Also remove a workaround from container_fwd.hpp Fixes #2924. ........ r52304 | danieljames | 2009-04-10 20:25:32 +0100 (Fri, 10 Apr 2009) | 4 lines Don't use debug containers on darwin. I'm getting errors from the darwin 4.2 debug containers which appear to a problem with its implementation. ........ r52320 | danieljames | 2009-04-11 08:53:59 +0100 (Sat, 11 Apr 2009) | 1 line Don't need to include utility now that select_stdlib has been fixed. ........ r52323 | danieljames | 2009-04-11 09:26:20 +0100 (Sat, 11 Apr 2009) | 1 line Also don't need to check for _GLIBCXX_CSTDDEF. ........ [SVN r52324] --- include/boost/detail/container_fwd.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/detail/container_fwd.hpp b/include/boost/detail/container_fwd.hpp index b7e3a71..f54dedb 100644 --- a/include/boost/detail/container_fwd.hpp +++ b/include/boost/detail/container_fwd.hpp @@ -19,7 +19,7 @@ #define BOOST_HASH_CHAR_TRAITS char_traits #endif -#if (defined(__GLIBCXX__) && 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))