diff options
author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2017-08-12 19:09:40 +0000 |
---|---|---|
committer | Edward Smith-Rowland <3dw4rd@verizon.net> | 2017-08-12 19:09:40 +0000 |
commit | 40fa8ee5f9da161462fde48776ef6262366f9a13 (patch) | |
tree | d3c3bf913950c59ef83b8d9ede50b0978ec0c12f /libstdc++-v3/include/bits/regex_scanner.tcc | |
parent | 3acaf2e51caf356a9afc763cfd70b91d1ab094b5 (diff) |
Merged revisions r232323 through r251067 to the branchtr29124
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tr29124@251068 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/regex_scanner.tcc')
-rw-r--r-- | libstdc++-v3/include/bits/regex_scanner.tcc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/regex_scanner.tcc b/libstdc++-v3/include/bits/regex_scanner.tcc index ad0b0477f3c..c65bfe2f68d 100644 --- a/libstdc++-v3/include/bits/regex_scanner.tcc +++ b/libstdc++-v3/include/bits/regex_scanner.tcc @@ -48,10 +48,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace __detail -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace __detail +{ template<typename _CharT> _Scanner<_CharT>:: _Scanner(typename _Scanner::_IterT __begin, @@ -584,6 +584,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #endif -_GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail +_GLIBCXX_END_NAMESPACE_VERSION } // namespace |