From e9dd48d91da11d1af1e61f773a060a44fd9e457e Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 19 Jan 2011 20:00:47 +0000 Subject: PR libstdc++/36104 part two 2011-01-19 Benjamin Kosnik PR libstdc++/36104 part two * include/bits/hashtable.h: Revert to non-nested macro usage. * include/bits/hashtable_policy.h: Same. From-SVN: r169021 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/hashtable.h | 4 ++-- libstdc++-v3/include/bits/hashtable_policy.h | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1089691..a4810b3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-01-19 Benjamin Kosnik + + PR libstdc++/36104 part two + * include/bits/hashtable.h: Revert to non-nested macro usage. + * include/bits/hashtable_policy.h: Same. + 2011-01-19 Graham Reed PR libstdc++/47354 diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 721d122..52f1b31 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -35,7 +35,7 @@ #include -_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) +_GLIBCXX_BEGIN_NAMESPACE(std) // Class template _Hashtable, class definition. @@ -1229,6 +1229,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) } } -_GLIBCXX_END_NESTED_NAMESPACE // namespace std +_GLIBCXX_END_NAMESPACE // namespace std #endif // _HASHTABLE_H diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index e439dfa..7b13719 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -31,7 +31,7 @@ #ifndef _HASHTABLE_POLICY_H #define _HASHTABLE_POLICY_H 1 -_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) +_GLIBCXX_BEGIN_NAMESPACE(std) namespace __detail { @@ -979,6 +979,6 @@ namespace __detail } } // namespace __detail -_GLIBCXX_END_NESTED_NAMESPACE // namespace std +_GLIBCXX_END_NAMESPACE // namespace std #endif // _HASHTABLE_POLICY_H -- cgit v1.1