Skip to content

R
riscv-gcc-1
Commit a70a4be9 by Jonathan Wakely Committed by Jonathan Wakely
Options

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
parent 82a0f2fd
Showing with 28 additions and 38 deletions
libstdc++-v3/ChangeLog
2018-10-16 Jonathan Wakely <jwakely@redhat.com> 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. * config.h.in: Regenerate.
* configure: Regenerate. * configure: Regenerate.
* configure.ac: Check for headers used by Networking TS. * configure.ac: Check for headers used by Networking TS.
......
libstdc++-v3/include/experimental/bits/net.h
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -163,10 +163,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -163,10 +163,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
libstdc++-v3/include/experimental/buffer
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -876,20 +876,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -876,20 +876,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif #endif
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<> template<>
struct is_error_code_enum<experimental::net::v1::stream_errc> struct is_error_code_enum<experimental::net::v1::stream_errc>
: public true_type {}; : public true_type {};
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
libstdc++-v3/include/experimental/executor
...@@ -49,13 +49,13 @@ ...@@ -49,13 +49,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -1868,13 +1868,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1868,13 +1868,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Alloc> template<typename _Alloc>
struct uses_allocator<experimental::net::executor, _Alloc> struct uses_allocator<experimental::net::executor, _Alloc>
: true_type {}; : true_type {};
......
libstdc++-v3/include/experimental/internet
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
...@@ -67,7 +68,6 @@ inline namespace v1 ...@@ -67,7 +68,6 @@ inline namespace v1
{ {
namespace ip namespace ip
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -2145,11 +2145,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2145,11 +2145,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static const int _S_name = IPV6_V6ONLY; static const int _S_name = IPV6_V6ONLY;
}; };
_GLIBCXX_END_NAMESPACE_VERSION namespace unicast
{
namespace unicast {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Set the default number of hops (TTL) for outbound datagrams. /// Set the default number of hops (TTL) for outbound datagrams.
struct hops : __sockopt_crtp<hops> struct hops : __sockopt_crtp<hops>
{ {
...@@ -2165,13 +2162,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2165,13 +2162,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
name(const _Protocol& __p) const noexcept name(const _Protocol& __p) const noexcept
{ return __p.family() == AF_INET6 ? IPV6_UNICAST_HOPS : IP_TTL; } { return __p.family() == AF_INET6 ? IPV6_UNICAST_HOPS : IP_TTL; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace unicast } // namespace unicast
namespace multicast { namespace multicast
_GLIBCXX_BEGIN_NAMESPACE_VERSION {
/// Request that a socket joins a multicast group. /// Request that a socket joins a multicast group.
struct join_group struct join_group
{ {
...@@ -2368,7 +2362,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2368,7 +2362,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace multicast } // namespace multicast
// @} // @}
...@@ -2415,6 +2408,7 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -2415,6 +2408,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
{ return _Hash_impl::hash(__a.to_bytes()); } { return _Hash_impl::hash(__a.to_bytes()); }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
libstdc++-v3/include/experimental/io_context
...@@ -53,13 +53,13 @@ ...@@ -53,13 +53,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -861,10 +861,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -861,10 +861,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
libstdc++-v3/include/experimental/netfwd
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -90,12 +90,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -90,12 +90,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
namespace ip namespace ip
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
* @{ * @{
...@@ -121,13 +117,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -121,13 +117,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
class udp; class udp;
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace ip } // namespace ip
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
libstdc++-v3/include/experimental/socket
...@@ -61,13 +61,13 @@ ...@@ -61,13 +61,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -2598,7 +2598,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2598,7 +2598,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// @} // @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
...@@ -2607,6 +2606,7 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -2607,6 +2606,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
struct is_error_code_enum<experimental::net::v1::socket_errc> struct is_error_code_enum<experimental::net::v1::socket_errc>
: public true_type {}; : public true_type {};
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
libstdc++-v3/include/experimental/timer
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace net namespace net
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup networking * @ingroup networking
...@@ -197,10 +197,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -197,10 +197,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// @} /// @}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace net } // namespace net
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment