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

libstdc++: Use <sys/socket.h> features conditionally [PR 100285]

Browse Source 
This makes the uses of getsockopt and setsockopt in
<experimental/socket> conditional on the availability of <sys/socket.h>.

It also fixes a test to check for <sys/socket.h> instead of <socket.h>.

libstdc++-v3/ChangeLog:

	PR libstdc++/100285
	* include/experimental/socket (__basic_socket_impl::set_option)
	(__basic_socket_impl::get_option) [!_GLIBCXX_HAVE_SYS_SOCKET_H]:
	Just set error code.
	* testsuite/experimental/net/socket/socket_base.cc: CHeck
	for <sys/socket.h> not <socket.h>.

(cherry picked from commit 0d501c3385)
This commit is contained in:
Jonathan Wakely 2021-04-30 14:25:25 +01:00
parent 2cf1aae145
commit f9325e99bb
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -622,6 +622,7 @@ inline namespace v1
void
set_option(const _SettableSocketOption& __option, error_code& __ec)
{
# ifdef _GLIBCXX_HAVE_SYS_SOCKET_H
int __result = ::setsockopt(_M_sockfd, __option.level(_M_protocol),
__option.name(_M_protocol),
__option.data(_M_protocol),
@ -630,12 +631,16 @@ inline namespace v1
__ec.assign(errno, generic_category());
else
__ec.clear();
#else
__ec = std::make_error_code(std::errc::not_supported);
#endif
}
template<typename _GettableSocketOption>
void
get_option(_GettableSocketOption& __option, error_code& __ec) const
{
# ifdef _GLIBCXX_HAVE_SYS_SOCKET_H
int __result = ::getsockopt(_M_sockfd, __option.level(_M_protocol),
__option.name(_M_protocol),
__option.data(_M_protocol),
@ -644,6 +649,9 @@ inline namespace v1
__ec.assign(errno, generic_category());
else
__ec.clear();
#else
__ec = std::make_error_code(std::errc::not_supported);
#endif
}
template<typename _IoControlCommand>

4
libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc
View File

@ -129,7 +129,7 @@ void check_integer_sockopt()
void test_option_types()
{
#if __has_include(<socket.h>)
#if __has_include(<sys/socket.h>)
check_boolean_sockopt<S::broadcast>();
check_boolean_sockopt<S::debug>();
@ -174,7 +174,7 @@ void test_option_types()
void test_constants()
{
#if __has_include(<socket.h>)
#if __has_include(<sys/socket.h>)
static_assert( is_enum<S::shutdown_type>::value, "" );
static_assert( S::shutdown_receive != S::shutdown_send, "" );
static_assert( S::shutdown_receive != S::shutdown_both, "" );