From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 344D5384F027; Fri, 30 Apr 2021 13:47:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 344D5384F027 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-318] libstdc++: Use features conditionally [PR 100285] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 57028ff2d3f56deec25498f83e99c39478acc02f X-Git-Newrev: 0d501c338548152f9d2728d383eec3e9cef16784 Message-Id: <20210430134754.344D5384F027@sourceware.org> Date: Fri, 30 Apr 2021 13:47:54 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2021 13:47:54 -0000 https://gcc.gnu.org/g:0d501c338548152f9d2728d383eec3e9cef16784 commit r12-318-g0d501c338548152f9d2728d383eec3e9cef16784 Author: Jonathan Wakely Date: Fri Apr 30 14:25:25 2021 +0100 libstdc++: Use features conditionally [PR 100285] This makes the uses of getsockopt and setsockopt in conditional on the availability of . It also fixes a test to check for instead of . 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 not . Diff: --- libstdc++-v3/include/experimental/socket | 8 ++++++++ libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/experimental/socket b/libstdc++-v3/include/experimental/socket index bf6a8c87e67..9db4a245ccf 100644 --- a/libstdc++-v3/include/experimental/socket +++ b/libstdc++-v3/include/experimental/socket @@ -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 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 diff --git a/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc b/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc index 1c02c5a09da..f957b6c92f6 100644 --- a/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc +++ b/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc @@ -129,7 +129,7 @@ void check_integer_sockopt() void test_option_types() { -#if __has_include() +#if __has_include() check_boolean_sockopt(); check_boolean_sockopt(); @@ -174,7 +174,7 @@ void test_option_types() void test_constants() { -#if __has_include() +#if __has_include() static_assert( is_enum::value, "" ); static_assert( S::shutdown_receive != S::shutdown_send, "" ); static_assert( S::shutdown_receive != S::shutdown_both, "" );