OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR libstdc++/36104 part two

Browse Source 
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.

From-SVN: r169021
This commit is contained in:
Benjamin Kosnik 2011-01-19 20:00:47 +00:00 committed by Benjamin Kosnik
parent 6845790106
commit e9dd48d91d
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2011-01-19 Graham Reed <greed@pobox.com> 2011-01-19 Graham Reed <greed@pobox.com>
PR libstdc++/47354 PR libstdc++/47354

4
libstdc++-v3/include/bits/hashtable.h
View File

@ -35,7 +35,7 @@
#include <bits/hashtable_policy.h> #include <bits/hashtable_policy.h>
_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) _GLIBCXX_BEGIN_NAMESPACE(std)
// Class template _Hashtable, class definition. // 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 #endif // _HASHTABLE_H

4
libstdc++-v3/include/bits/hashtable_policy.h
View File

@ -31,7 +31,7 @@
#ifndef _HASHTABLE_POLICY_H #ifndef _HASHTABLE_POLICY_H
#define _HASHTABLE_POLICY_H 1 #define _HASHTABLE_POLICY_H 1
_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) _GLIBCXX_BEGIN_NAMESPACE(std)
namespace __detail namespace __detail
{ {
@ -979,6 +979,6 @@ namespace __detail
} }
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NESTED_NAMESPACE // namespace std _GLIBCXX_END_NAMESPACE // namespace std
#endif // _HASHTABLE_POLICY_H #endif // _HASHTABLE_POLICY_H