public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-6327] libstdc++: Make net::ip::basic_endpoint comparisons constexpr
@ 2023-02-24 14:26 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-02-24 14:26 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:97111dccf97d8b4dbf7c1ef11c72827295a72466
commit r13-6327-g97111dccf97d8b4dbf7c1ef11c72827295a72466
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Feb 24 13:00:41 2023 +0000
libstdc++: Make net::ip::basic_endpoint comparisons constexpr
libstdc++-v3/ChangeLog:
* include/experimental/internet (basic_endpoint): Add missing
constexpr to comparison operators.
* testsuite/experimental/net/internet/endpoint/cons.cc: New test.
Diff:
---
libstdc++-v3/include/experimental/internet | 12 ++--
.../experimental/net/internet/endpoint/cons.cc | 66 ++++++++++++++++++++++
2 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/libstdc++-v3/include/experimental/internet b/libstdc++-v3/include/experimental/internet
index 5336b8a8ce3..cae07f466da 100644
--- a/libstdc++-v3/include/experimental/internet
+++ b/libstdc++-v3/include/experimental/internet
@@ -1626,19 +1626,19 @@ namespace ip
*/
template<typename _InternetProtocol>
- inline bool
+ constexpr bool
operator==(const basic_endpoint<_InternetProtocol>& __a,
const basic_endpoint<_InternetProtocol>& __b)
{ return __a.address() == __b.address() && __a.port() == __b.port(); }
template<typename _InternetProtocol>
- inline bool
+ constexpr bool
operator!=(const basic_endpoint<_InternetProtocol>& __a,
const basic_endpoint<_InternetProtocol>& __b)
{ return !(__a == __b); }
template<typename _InternetProtocol>
- inline bool
+ constexpr bool
operator< (const basic_endpoint<_InternetProtocol>& __a,
const basic_endpoint<_InternetProtocol>& __b)
{
@@ -1647,19 +1647,19 @@ namespace ip
}
template<typename _InternetProtocol>
- inline bool
+ constexpr bool
operator> (const basic_endpoint<_InternetProtocol>& __a,
const basic_endpoint<_InternetProtocol>& __b)
{ return __b < __a; }
template<typename _InternetProtocol>
- inline bool
+ constexpr bool
operator<=(const basic_endpoint<_InternetProtocol>& __a,
const basic_endpoint<_InternetProtocol>& __b)
{ return !(__b < __a); }
template<typename _InternetProtocol>
- inline bool
+ constexpr bool
operator>=(const basic_endpoint<_InternetProtocol>& __a,
const basic_endpoint<_InternetProtocol>& __b)
{ return !(__a < __b); }
diff --git a/libstdc++-v3/testsuite/experimental/net/internet/endpoint/cons.cc b/libstdc++-v3/testsuite/experimental/net/internet/endpoint/cons.cc
new file mode 100644
index 00000000000..1b5c92c0b58
--- /dev/null
+++ b/libstdc++-v3/testsuite/experimental/net/internet/endpoint/cons.cc
@@ -0,0 +1,66 @@
+// { dg-do run { target c++14 } }
+// { dg-require-effective-target net_ts_ip }
+// { dg-add-options net_ts }
+
+#include <experimental/internet>
+#include <testsuite_hooks.h>
+
+using namespace std::experimental::net;
+
+constexpr void
+test_default()
+{
+ ip::tcp::endpoint t1;
+ VERIFY( t1.protocol() == ip::tcp::v4() );
+ VERIFY( t1.address() == ip::address() );
+ VERIFY( t1.port() == 0 );
+
+ ip::udp::endpoint t2;
+ VERIFY( t2.protocol() == ip::udp::v4() );
+ VERIFY( t2.address() == ip::address() );
+ VERIFY( t2.port() == 0 );
+}
+
+constexpr void
+test_proto()
+{
+ ip::tcp::endpoint t1(ip::tcp::v4(), 22);
+ VERIFY( t1.protocol() == ip::tcp::v4() );
+ VERIFY( t1.address() == ip::address_v4() );
+ VERIFY( t1.port() == 22 );
+
+ ip::tcp::endpoint t2(ip::tcp::v6(), 80);
+ VERIFY( t2.protocol() == ip::tcp::v6() );
+ VERIFY( t2.address() == ip::address_v6() );
+ VERIFY( t2.port() == 80 );
+}
+
+constexpr void
+test_addr()
+{
+ ip::address_v4 a1(ip::address_v4::bytes_type(1, 2, 3, 4));
+ ip::tcp::endpoint t1(a1, 22);
+ VERIFY( t1.protocol() == ip::tcp::v4() );
+ VERIFY( t1.address() == a1 );
+ VERIFY( t1.port() == 22 );
+
+ ip::address_v6 a2(ip::address_v6::bytes_type(21,22,23,24,25,26,27,28,29));
+ ip::tcp::endpoint t2(a2, 80);
+ VERIFY( t2.protocol() == ip::tcp::v6() );
+ VERIFY( t2.address() == a2 );
+ VERIFY( t2.port() == 80 );
+}
+
+int main()
+{
+ test_default();
+ test_proto();
+ test_addr();
+
+ constexpr bool c = [] {
+ test_default();
+ test_proto();
+ test_addr();
+ return true;
+ };
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-24 14:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-24 14:26 [gcc r13-6327] libstdc++: Make net::ip::basic_endpoint comparisons constexpr Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).