From a70a4be9c25b5438308f1111e8e8210563d7550a Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 16 Oct 2018 17:12:51 +0100
Subject: [PATCH] Fix versioned namespace macros for Networking TS

We no longer put the versioned namespace macros on the innermost
namespace, but always nested directly below namespace std.

	* include/experimental/bits/net.h: Move versioned namespace macros
	to correct location.
	* include/experimental/buffer: Likewise.
	* include/experimental/executor: Likewise.
	* include/experimental/internet: Likewise.
	* include/experimental/io_context: Likewise.
	* include/experimental/netfwd: Likewise.
	* include/experimental/socket: Likewise.
	* include/experimental/timer: Likewise.

From-SVN: r265204
---
 libstdc++-v3/ChangeLog                       | 10 ++++++++++
 libstdc++-v3/include/experimental/bits/net.h |  4 ++--
 libstdc++-v3/include/experimental/buffer     |  7 +------
 libstdc++-v3/include/experimental/executor   |  5 +----
 libstdc++-v3/include/experimental/internet   | 18 ++++++------------
 libstdc++-v3/include/experimental/io_context |  4 ++--
 libstdc++-v3/include/experimental/netfwd     | 10 ++--------
 libstdc++-v3/include/experimental/socket     |  4 ++--
 libstdc++-v3/include/experimental/timer      |  4 ++--
 9 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 681e88cb3a2..d20f497148f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,15 @@
 2018-10-16  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/experimental/bits/net.h: Move versioned namespace macros
+	to correct location.
+	* include/experimental/buffer: Likewise.
+	* include/experimental/executor: Likewise.
+	* include/experimental/internet: Likewise.
+	* include/experimental/io_context: Likewise.
+	* include/experimental/netfwd: Likewise.
+	* include/experimental/socket: Likewise.
+	* include/experimental/timer: Likewise.
+
 	* config.h.in: Regenerate.
 	* configure: Regenerate.
 	* configure.ac: Check for headers used by Networking TS.
diff --git a/libstdc++-v3/include/experimental/bits/net.h b/libstdc++-v3/include/experimental/bits/net.h
index 17bd300ccf2..e2fedd358a5 100644
--- a/libstdc++-v3/include/experimental/bits/net.h
+++ b/libstdc++-v3/include/experimental/bits/net.h
@@ -40,13 +40,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -163,10 +163,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
 } // namespace net
 } // namespace experimental
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14
diff --git a/libstdc++-v3/include/experimental/buffer b/libstdc++-v3/include/experimental/buffer
index 5541823165b..754a9de9953 100644
--- a/libstdc++-v3/include/experimental/buffer
+++ b/libstdc++-v3/include/experimental/buffer
@@ -43,13 +43,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -876,20 +876,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
-
 } // namespace v1
 } // namespace net
 } // namespace experimental
 
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
   template<>
     struct is_error_code_enum<experimental::net::v1::stream_errc>
     : public true_type {};
 
 _GLIBCXX_END_NAMESPACE_VERSION
-
 } // namespace std
 
 #endif // C++14
diff --git a/libstdc++-v3/include/experimental/executor b/libstdc++-v3/include/experimental/executor
index db8df4b871b..a9cb583c50d 100644
--- a/libstdc++-v3/include/experimental/executor
+++ b/libstdc++-v3/include/experimental/executor
@@ -49,13 +49,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -1868,13 +1868,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
 } // namespace net
 } // namespace experimental
 
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
   template<typename _Alloc>
     struct uses_allocator<experimental::net::executor, _Alloc>
     : true_type {};
diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet
index 402a0474a95..5e1dbb834db 100644
--- a/libstdc++-v3/include/experimental/internet
+++ b/libstdc++-v3/include/experimental/internet
@@ -59,6 +59,7 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
@@ -67,7 +68,6 @@ inline namespace v1
 {
 namespace ip
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -2145,11 +2145,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     static const int _S_name = IPV6_V6ONLY;
   };
 
-_GLIBCXX_END_NAMESPACE_VERSION
-
-  namespace unicast {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
+  namespace unicast
+  {
     /// Set the default number of hops (TTL) for outbound datagrams.
     struct hops : __sockopt_crtp<hops>
     {
@@ -2165,13 +2162,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	name(const _Protocol& __p) const noexcept
 	{ return __p.family() == AF_INET6 ? IPV6_UNICAST_HOPS : IP_TTL; }
     };
-
-_GLIBCXX_END_NAMESPACE_VERSION
   } // namespace unicast
 
-  namespace multicast {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
+  namespace multicast
+  {
     /// Request that a socket joins a multicast group.
     struct join_group
     {
@@ -2368,7 +2362,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	}
     };
 
-_GLIBCXX_END_NAMESPACE_VERSION
   } // namespace multicast
 
   // @}
@@ -2415,6 +2408,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
       { return _Hash_impl::hash(__a.to_bytes()); }
     };
 
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14
diff --git a/libstdc++-v3/include/experimental/io_context b/libstdc++-v3/include/experimental/io_context
index b8d231f7e68..78940645632 100644
--- a/libstdc++-v3/include/experimental/io_context
+++ b/libstdc++-v3/include/experimental/io_context
@@ -53,13 +53,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -861,10 +861,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
 } // namespace net
 } // namespace experimental
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14
diff --git a/libstdc++-v3/include/experimental/netfwd b/libstdc++-v3/include/experimental/netfwd
index a0311a9aa69..cafac446fbf 100644
--- a/libstdc++-v3/include/experimental/netfwd
+++ b/libstdc++-v3/include/experimental/netfwd
@@ -40,13 +40,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -90,12 +90,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
-
 namespace ip
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
   /**
    * @ingroup networking
    * @{
@@ -121,13 +117,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     class udp;
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace ip
-
-
 } // namespace v1
 } // namespace net
 } // namespace experimental
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14
diff --git a/libstdc++-v3/include/experimental/socket b/libstdc++-v3/include/experimental/socket
index e903eb824b2..e165edaf804 100644
--- a/libstdc++-v3/include/experimental/socket
+++ b/libstdc++-v3/include/experimental/socket
@@ -61,13 +61,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -2598,7 +2598,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   // @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
 } // namespace net
 } // namespace experimental
@@ -2607,6 +2606,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
     struct is_error_code_enum<experimental::net::v1::socket_errc>
     : public true_type {};
 
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14
diff --git a/libstdc++-v3/include/experimental/timer b/libstdc++-v3/include/experimental/timer
index 3ec365944da..af4b5bbe053 100644
--- a/libstdc++-v3/include/experimental/timer
+++ b/libstdc++-v3/include/experimental/timer
@@ -42,13 +42,13 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
 namespace experimental
 {
 namespace net
 {
 inline namespace v1
 {
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /**
    * @ingroup networking
@@ -197,10 +197,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// @}
 
-_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
 } // namespace net
 } // namespace experimental
+_GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 
 #endif // C++14