diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_grep_matcher.h | 3 |
4 files changed, 14 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 870fd9c1634..1c4be426a26 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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 diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index e334f94d3dd..8ac3c159d8c 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -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 diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index be391f3fea1..f29ee913918 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -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: /** diff --git a/libstdc++-v3/include/bits/regex_grep_matcher.h b/libstdc++-v3/include/bits/regex_grep_matcher.h index 06193bba3b7..9312bb368eb 100644 --- a/libstdc++-v3/include/bits/regex_grep_matcher.h +++ b/libstdc++-v3/include/bits/regex_grep_matcher.h @@ -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 { |