From e7297f3c52428b3af33d27a3da5fa6bc75250246 Mon Sep 17 00:00:00 2001
From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 22 Nov 2013 16:59:25 +0000
Subject: [PATCH] 	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
---
 libstdc++-v3/ChangeLog                                     | 10 ++++++++++
 libstdc++-v3/include/bits/c++config                        |  4 ++++
 libstdc++-v3/include/bits/regex.h                          |  4 ++--
 libstdc++-v3/include/bits/regex.tcc                        |  4 ++--
 libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp           |  2 +-
 libstdc++-v3/include/std/iomanip                           |  5 ++++-
 libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc |  2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3580a88d65c..4aca7a7b4bd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -4,6 +4,16 @@
 	* configure: Regenerate.
 	* doc/xml/manual/abi.xml: Update version information.
 
+	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.
+
 2013-11-22  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* testsuite/ext/random/hypergeometric_distribution/operators/
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
diff --git a/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp b/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp
index 90bda95d208..3d16e5229e4 100644
--- a/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/tag_and_trait.hpp
@@ -447,7 +447,7 @@ namespace __gnu_pbds
     template<typename Key, typename Mapped, typename _Alloc, typename Tag,
 	     typename Policy_Tl = null_type>
       struct container_base_dispatch;
-  } // namespace __detail
+  } // namespace detail
   //@}
 } // namespace __gnu_pbds
 
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.
diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
index 23c551b0b6e..a691e8d16f2 100644
--- a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
+++ b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
@@ -25,4 +25,4 @@
 
 #include <vector>
 
-// { dg-error "multiple inlined namespaces" "" { target *-*-* } 275 }
+// { dg-error "multiple inlined namespaces" "" { target *-*-* } 279 }
-- 
2.11.4.GIT