re PR libstdc++/59247 (Bootstrap fails due to errors in libstdc++ sources with `...

	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.

From-SVN: r205277

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3580a88d65c97e079f25efd76ea39afa36e0d83a..4aca7a7b4bded1b605a1d45d6196b199d5321d46 100644 (file)
--- 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 aca8484e222fee1a98f5d3117797437322ebbbd2..b00bc41d634f9654efa08adf23f8c81508d7ce50 100644 (file)
--- 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 84b8cf1dd4fd65707047d7e5018872ac77ed4aba..9f8a0ebf3fe9e9a126053510b577bebd5feaa1f6 100644 (file)
--- 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 2ac095d9881c2875a5e20962e830b3400dbaaca2..f58b32d296a3640521b42b9540d67a717e28948e 100644 (file)
--- 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 90bda95d20811740efeffd942f2c4ca787b043ec..3d16e5229e42fc2c31a084a539ddbb2fa32a70b6 100644 (file)
--- 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 47284e82a5a669b58c9b2dd30f7e901bf1f9cc8e..e135d08be335b09a558087cdb3a6924ec8206bc4 100644 (file)
--- 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 23c551b0b6ef3b2677baa735a570b1e0017aa499..a691e8d16f2f2aedd73358b7e3900b0675ab1d02 100644 (file)
--- 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 }