Patchwork [v3] libstdc++/36104 namespace versioning, revisited

login
register
mail settings
Submitter Benjamin Kosnik
Date Jan. 19, 2011, 8:31 p.m.
Message ID <20110119123159.39012958@shotwell>
Download mbox | patch
Permalink /patch/79587/
State New
Headers show

Comments

Benjamin Kosnik - Jan. 19, 2011, 8:31 p.m.
Un-break debug mode

tested x86_64/linux
tested x86_64/linux debug

-benjamin

Patch

2011-01-19  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/36104 part two
	* include/bits/hashtable.h: Revert to non-nested macro usage.
	* include/bits/hashtable_policy.h: Same.

Index: include/bits/hashtable.h
===================================================================
--- include/bits/hashtable.h	(revision 168979)
+++ include/bits/hashtable.h	(working copy)
@@ -35,7 +35,7 @@ 
 
 #include <bits/hashtable_policy.h>
 
-_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
+_GLIBCXX_BEGIN_NAMESPACE(std)
 
   // Class template _Hashtable, class definition.
 
@@ -1229,6 +1229,6 @@ 
 	}
     }
 
-_GLIBCXX_END_NESTED_NAMESPACE // namespace std
+_GLIBCXX_END_NAMESPACE // namespace std
 
 #endif // _HASHTABLE_H
Index: include/bits/hashtable_policy.h
===================================================================
--- include/bits/hashtable_policy.h	(revision 168979)
+++ include/bits/hashtable_policy.h	(working copy)
@@ -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
 
-_GLIBCXX_END_NESTED_NAMESPACE // namespace std
+_GLIBCXX_END_NAMESPACE // namespace std
 
 #endif // _HASHTABLE_POLICY_H