diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-10-16 17:12:51 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-10-16 17:12:51 +0100 |
| commit | a70a4be9c25b5438308f1111e8e8210563d7550a (patch) | |
| tree | 8afbdcb6c616b5661621de3819b177e6a467a3ff /libstdc++-v3/include/experimental/internet | |
| parent | 82a0f2fd10250b8129fd8a1c434b9e7dcf696bea (diff) | |
| download | gcc-a70a4be9c25b5438308f1111e8e8210563d7550a.tar.gz | |
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
Diffstat (limited to 'libstdc++-v3/include/experimental/internet')
| -rw-r--r-- | libstdc++-v3/include/experimental/internet | 18 |
1 files changed, 6 insertions, 12 deletions
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 |