diff options
| author | Martin Jambor <mjambor@suse.cz> | 2017-07-31 14:43:24 +0200 |
|---|---|---|
| committer | Martin Jambor <mjambor@suse.cz> | 2017-07-31 14:43:24 +0200 |
| commit | b32f12dece884f1fa0f04c643a77105aff6ce8bc (patch) | |
| tree | cdab5f10806561fc198f907299b0e55eb5701ef0 /libstdc++-v3/include/bits/regex.tcc | |
| parent | 166bec868d991fdf71f9a66f994e5977fcab4aa2 (diff) | |
| parent | a168a775e93ec31ae743ad282d8e60fa1c116891 (diff) | |
| download | gcc-gcn.tar.gz | |
Merge branch 'master' into gcngcn
Diffstat (limited to 'libstdc++-v3/include/bits/regex.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/regex.tcc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index dc32a49dcd9..fc2d5846c46 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -30,10 +30,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace __detail -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace __detail +{ // Result of merging regex_match and regex_search. // // __policy now can be _S_auto (auto dispatch) and _S_alternate (use @@ -118,12 +118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; } - -_GLIBCXX_END_NAMESPACE_VERSION } -_GLIBCXX_BEGIN_NAMESPACE_VERSION - template<typename _Ch_type> template<typename _Fwd_iter> typename regex_traits<_Ch_type>::string_type @@ -663,4 +659,3 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace - |