diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2007-10-26 14:38:12 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2007-10-26 14:38:12 +0000 |
| commit | 3f28024c07613ff04305839df0cfb1c098572d2e (patch) | |
| tree | 931b66af4810c096fd65d12a7a9c4aed5ff4854a | |
| parent | 90a1c3cea354cc8dc8969859f787902297b71d46 (diff) | |
| download | gcc-3f28024c07613ff04305839df0cfb1c098572d2e.zip gcc-3f28024c07613ff04305839df0cfb1c098572d2e.tar.gz gcc-3f28024c07613ff04305839df0cfb1c098572d2e.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/unordered_map | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/unordered_set | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f23432a..5ff4804 100644 --- 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 3e3dcf7..226fea8 100644 --- 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 daa64cd..3b0f22c 100644 --- 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 |