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

regex_compiler.h: Nest namespace versioning.

Browse Source 
2011-03-14  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/regex_compiler.h: Nest namespace versioning.
	* include/bits/regex_grep_matcher.tcc: Same.
	* include/bits/regex_grep_matcher.h: Same.
	* include/bits/regex_cursor.h: Same.
	* include/bits/regex_nfa.h: Same.
	* include/bits/regex_nfa.tcc: Same.

	* include/bits/regex_grep_matcher.h: Version forward declarations.
	* include/bits/c++config: Add namespace association for __regex.
	* include/bits/regex.h: Make sub_match consistent.

From-SVN: r170978
This commit is contained in:
Benjamin Kosnik 2011-03-15 02:55:19 +00:00 committed by Benjamin Kosnik
parent 77b0791e3d
commit e5a44bd645
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -24,6 +24,8 @@
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* config/abi/pre/gnu.ver: Add new exports.
2011-03-14 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/regex_compiler.h: Nest namespace versioning.
* include/bits/regex_grep_matcher.tcc: Same.
* include/bits/regex_grep_matcher.h: Same.
@ -31,6 +33,10 @@
* include/bits/regex_nfa.h: Same.
* include/bits/regex_nfa.tcc: Same.
* include/bits/regex_grep_matcher.h: Version forward declarations.
* include/bits/c++config: Add namespace association for __regex.
* include/bits/regex.h: Make sub_match consistent.
2011-03-14 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* doc/xml/manual/abi.xml: Replace docs.sun.com URLs by their OTN

6
libstdc++-v3/include/bits/c++config
View File

@ -170,9 +170,6 @@ namespace std
{
inline namespace _6 { }
namespace __detail { inline namespace _6 { } }
namespace rel_ops { inline namespace _6 { } }
namespace tr1
@ -189,6 +186,9 @@ namespace std
namespace placeholders { inline namespace _6 { } }
namespace regex_constants { inline namespace _6 { } }
namespace this_thread { inline namespace _6 { } }
namespace __detail { inline namespace _6 { } }
namespace __regex { inline namespace _6 { } }
}
namespace __gnu_cxx

5
libstdc++-v3/include/bits/regex.h
View File

@ -1459,7 +1459,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Bi_iter,
typename _Allocator = allocator<sub_match<_Bi_iter> > >
class match_results
: private std::vector<std::sub_match<_Bi_iter>, _Allocator>
: private std::vector<sub_match<_Bi_iter>, _Allocator>
{
private:
/*
@ -1473,8 +1473,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* [n+1] prefix
* [n+2] suffix
*/
typedef std::vector<std::sub_match<_Bi_iter>, _Allocator>
_Base_type;
typedef std::vector<sub_match<_Bi_iter>, _Allocator> _Base_type;
public:
/**

3
libstdc++-v3/include/bits/regex_grep_matcher.h
View File

@ -30,12 +30,15 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _BiIter>
class sub_match;
template<typename _Bi_iter, typename _Allocator>
class match_results;
_GLIBCXX_END_NAMESPACE_VERSION
namespace __regex
{