summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/std
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2013-11-22 16:59:25 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2013-11-22 16:59:25 +0000
commite7297f3c52428b3af33d27a3da5fa6bc75250246 (patch)
tree5d2da5b802972cf9d1cec9f85db21210718cf480 /libstdc++-v3/include/std
parent60dc82ead5535ecde6be3592a3d5a40f6d265253 (diff)
downloadppe42-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/std')
-rw-r--r--libstdc++-v3/include/std/iomanip5
1 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip
index 47284e82a5a..e135d08be33 100644
--- a/libstdc++-v3/include/std/iomanip
+++ b/libstdc++-v3/include/std/iomanip
@@ -336,7 +336,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201103L
+_GLIBCXX_END_NAMESPACE_VERSION
namespace __detail {
+ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Struct for delimited strings.
@@ -447,8 +449,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __is;
}
-
+ _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
/**
* @brief Manipulator for quoted strings.
OpenPOWER on IntegriCloud