unordered_map: Fix for parallel mode.

2007-10-26  Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/unordered_map: Fix for parallel mode.
	* include/std/unordered_set: Same.

From-SVN: r129654

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f23432a771edbcd5d0a4a5675d3a0839030517bc..5ff48044211cd6b6a1a127d302ec73341e8906c5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-26  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/std/unordered_map: Fix for parallel mode.
+       * include/std/unordered_set: Same.      
+
 2007-10-25  Andreas Tobler  <a.tobler@schweiz.org>
 
        * include/Makefile.am (parallel_headers): Remove timing.h.

diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map
index 3e3dcf75eb3606e647000cc555c78cf5c5545ebb..226fea8b106685aa2e82e2c7b89850c497a80bad 100644 (file)
--- a/libstdc++-v3/include/std/unordered_map
+++ b/libstdc++-v3/include/std/unordered_map
@@ -58,7 +58,7 @@
 #  include <tr1_impl/unordered_map>
 #else
 #  define _GLIBCXX_INCLUDE_AS_CXX0X
-#if _GLIBCXX_DEBUG
+#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
 #  define _GLIBCXX_BEGIN_NAMESPACE_TR1 namespace _GLIBCXX_STD_D {
 #  define _GLIBCXX_END_NAMESPACE_TR1 }
 #  define _GLIBCXX_TR1 _GLIBCXX_STD_D

diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set
index daa64cd4a8e3169323e6f03f766601c637e34a5e..3b0f22c341896861328e4efb201440ccc39d7874 100644 (file)
--- a/libstdc++-v3/include/std/unordered_set
+++ b/libstdc++-v3/include/std/unordered_set
@@ -58,7 +58,7 @@
 #  include <tr1_impl/unordered_set>
 #else
 #  define _GLIBCXX_INCLUDE_AS_CXX0X
-#if _GLIBCXX_DEBUG
+#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
 #  define _GLIBCXX_BEGIN_NAMESPACE_TR1 namespace _GLIBCXX_STD_D {
 #  define _GLIBCXX_END_NAMESPACE_TR1 }
 #  define _GLIBCXX_TR1 _GLIBCXX_STD_D