diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2013-08-08 13:34:12 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2013-08-08 13:34:12 +0000 |
| commit | 374cf1652d98cf5ce55b26442df1e3591081926d (patch) | |
| tree | 69c0ed6be49662346a9b5e66170256b4066cb595 | |
| parent | b09bcf83e8fe1b941aa42457b6063a2a174d7389 (diff) | |
| download | gcc-374cf1652d98cf5ce55b26442df1e3591081926d.zip gcc-374cf1652d98cf5ce55b26442df1e3591081926d.tar.gz gcc-374cf1652d98cf5ce55b26442df1e3591081926d.tar.bz2 | |
Don't use _B etc. in libstdc++
* include/bits/regex.h: Replace _A, _B, _C, _R by _Ap, _Bp,
_Cp, _Rp.
From-SVN: r201596
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 24 |
2 files changed, 17 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 41150bd..7a14117 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-08-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * include/bits/regex.h: Replace _A, _B, _C, _R by _Ap, _Bp, + _Cp, _Rp. + 2013-08-08 François Dumont <fdumont@gcc.gnu.org> * include/bits/hashtable_policy.h (_Hashtable_alloc): New. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index ea32ade..2776749 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -995,18 +995,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const basic_regex<_CharT, _TraitsT>&, regex_constants::match_flag_type); - template<typename _B, typename _A, typename _C, typename _R> + template<typename _Bp, typename _Ap, typename _Cp, typename _Rp> friend bool - regex_match(_B, _B, - match_results<_B, _A>&, - const basic_regex<_C, _R>&, + regex_match(_Bp, _Bp, + match_results<_Bp, _Ap>&, + const basic_regex<_Cp, _Rp>&, regex_constants::match_flag_type); - template<typename _B, typename _A, typename _C, typename _R> + template<typename _Bp, typename _Ap, typename _Cp, typename _Rp> friend bool - regex_search(_B, _B, - match_results<_B, _A>&, - const basic_regex<_C, _R>&, + regex_search(_Bp, _Bp, + match_results<_Bp, _Ap>&, + const basic_regex<_Cp, _Rp>&, regex_constants::match_flag_type); flag_type _M_flags; @@ -2111,16 +2111,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename, typename, typename, typename> friend class __detail::_BFSExecutor; - template<typename _B, typename _A, typename _Ch_type, typename _Rx_traits> + template<typename _Bp, typename _Ap, typename _Ch_type, typename _Rx_traits> friend bool - regex_match(_B, _B, match_results<_B, _A>&, + regex_match(_Bp, _Bp, match_results<_Bp, _Ap>&, const basic_regex<_Ch_type, _Rx_traits>&, regex_constants::match_flag_type); - template<typename _B, typename _A, typename _Ch_type, typename _Rx_traits> + template<typename _Bp, typename _Ap, typename _Ch_type, typename _Rx_traits> friend bool - regex_search(_B, _B, match_results<_B, _A>&, + regex_search(_Bp, _Bp, match_results<_Bp, _Ap>&, const basic_regex<_Ch_type, _Rx_traits>&, regex_constants::match_flag_type); |