OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2018-10-16 17:12:51 +01:00 committed by Jonathan Wakely
parent 82a0f2fd10
commit a70a4be9c2
9 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -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.

4
libstdc++-v3/include/experimental/bits/net.h
View File

@ -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

7
libstdc++-v3/include/experimental/buffer
View File

@ -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

5
libstdc++-v3/include/experimental/executor
View File

@ -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 {};

18
libstdc++-v3/include/experimental/internet
View File

@ -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

4
libstdc++-v3/include/experimental/io_context
View File

@ -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

10
libstdc++-v3/include/experimental/netfwd
View File

@ -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

4
libstdc++-v3/include/experimental/socket
View File

@ -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

4
libstdc++-v3/include/experimental/timer
View File

@ -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