diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-22 16:59:25 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-22 16:59:25 +0000 |
| commit | e7297f3c52428b3af33d27a3da5fa6bc75250246 (patch) | |
| tree | 5d2da5b802972cf9d1cec9f85db21210718cf480 /libstdc++-v3/include/bits | |
| parent | 60dc82ead5535ecde6be3592a3d5a40f6d265253 (diff) | |
| download | ppe42-gcc-e7297f3c52428b3af33d27a3da5fa6bc75250246.tar.gz ppe42-gcc-e7297f3c52428b3af33d27a3da5fa6bc75250246.zip | |
PR libstdc++/59247
* include/bits/c++config (_GLIBCXX_INLINE_VERSION): Declare namespace
std::experimental::__7 as inline.
* include/bits/regex.h (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Do not
enclose namespace __detail.
* include/bits/regex.tcc (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Likewise.
* include/std/iomanip (_GLIBCXX_BEGIN_NAMESPACE_VERSION): Likewise.
* include/ext/pb_ds/tag_and_trait.hpp (detail): Fix comment.
* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust line number.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205277 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits')
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.tcc | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index aca8484e222..b00bc41d634 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -169,6 +169,8 @@ namespace placeholders { } namespace regex_constants { } namespace this_thread { } + + namespace experimental { } } namespace abi { } @@ -222,6 +224,8 @@ namespace std namespace regex_constants { inline namespace __7 { } } namespace this_thread { inline namespace __7 { } } + namespace experimental { inline namespace __7 { } } + namespace __detail { inline namespace __7 { } } } diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 84b8cf1dd4f..9f8a0ebf3fe 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -30,8 +30,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - namespace __detail { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -53,6 +51,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } +_GLIBCXX_BEGIN_NAMESPACE_VERSION + /** * @addtogroup regex * @{ diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index 2ac095d9881..f58b32d296a 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -37,8 +37,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - namespace __detail { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -137,6 +135,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } +_GLIBCXX_BEGIN_NAMESPACE_VERSION + template<typename _Ch_type> template<typename _Fwd_iter> typename regex_traits<_Ch_type>::string_type |
