Skip to content

Commit

Permalink
Remove IPADDRESS_CONSTEXPR_14
Browse files Browse the repository at this point in the history
  • Loading branch information
@VladimirShaleev
VladimirShaleev committed Feb 24, 2024
1 parent 0b1eca3 commit a2c0d68
Show file tree
Hide file tree
Showing 11 changed files with 81 additions and 87 deletions.
1 change: 0 additions & 1 deletion doc/Doxyfile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2470,7 +2470,6 @@ INCLUDE_FILE_PATTERNS =

PREDEFINED = "IPADDRESS_FORCE_INLINE=\"inline\"" \
"IPADDRESS_CONSTEXPR=\"constexpr\"" \
"IPADDRESS_CONSTEXPR_14=\"constexpr\"" \
"IPADDRESS_CONSTEXPR_17=\"constexpr\"" \
"IPADDRESS_CONSTEVAL=\"consteval\"" \
"IPADDRESS_CPP_VERSION=\"20\"" \
Expand Down
5 changes: 0 additions & 5 deletions include/ipaddress/config.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@

#ifdef __cpp_constexpr
# define IPADDRESS_CONSTEXPR constexpr
# if __cpp_constexpr >= 201304L
# define IPADDRESS_CONSTEXPR_14 constexpr
# else
# define IPADDRESS_CONSTEXPR_14
# endif
# if __cpp_constexpr >= 201603L
# define IPADDRESS_CONSTEXPR_17 constexpr
# else
Expand Down
2 changes: 1 addition & 1 deletion include/ipaddress/ip-address-base.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ class ip_address_base : public Base {
*
* @param[in] ip The other IP address to swap with.
*/
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE void swap(ip_address_base& ip) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE void swap(ip_address_base& ip) IPADDRESS_NOEXCEPT {
Base::swap(*this, ip);
}

Expand Down
44 changes: 22 additions & 22 deletions include/ipaddress/ip-address-iterator.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class ip_reverse_iterator {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator(const ip_reverse_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator(ip_reverse_iterator&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator=(const ip_reverse_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator=(ip_reverse_iterator&&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator=(const ip_reverse_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator=(ip_reverse_iterator&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE explicit ip_reverse_iterator(Iterator it) IPADDRESS_NOEXCEPT
: _it(it.reverse()) {
Expand Down Expand Up @@ -57,44 +57,44 @@ class ip_reverse_iterator {
return *(_it - n);
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator++() IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator++() IPADDRESS_NOEXCEPT {
--_it;
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator operator++(int) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator operator++(int) IPADDRESS_NOEXCEPT {
auto tmp = *this;
++(*this);
return tmp;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator--() IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator--() IPADDRESS_NOEXCEPT {
++_it;
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator operator--(int) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator operator--(int) IPADDRESS_NOEXCEPT {
auto tmp = *this;
--(*this);
return tmp;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator+=(difference_type n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator+=(difference_type n) IPADDRESS_NOEXCEPT {
_it -= n;
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator+=(const uint_type& n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator+=(const uint_type& n) IPADDRESS_NOEXCEPT {
_it -= n;
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator-=(difference_type n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator-=(difference_type n) IPADDRESS_NOEXCEPT {
_it += n;
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator-=(const uint_type& n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_reverse_iterator& operator-=(const uint_type& n) IPADDRESS_NOEXCEPT {
_it += n;
return *this;
}
Expand Down Expand Up @@ -194,8 +194,8 @@ class ip_address_iterator<ip_address_base<Base>> {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator(const ip_address_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator(ip_address_iterator&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator=(const ip_address_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator=(ip_address_iterator&&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator=(const ip_address_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator=(ip_address_iterator&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator(reference begin, reference end, reference ref, int carry = 0) IPADDRESS_NOEXCEPT
: _current(ref), _offset(ref.to_uint()), _carry(carry) {
Expand All @@ -222,44 +222,44 @@ class ip_address_iterator<ip_address_base<Base>> {
return value_type::from_uint(_offset + n);
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator++() IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator++() IPADDRESS_NOEXCEPT {
add(1);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator operator++(int) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator operator++(int) IPADDRESS_NOEXCEPT {
auto tmp = *this;
++(*this);
return tmp;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator--() IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator--() IPADDRESS_NOEXCEPT {
sub(1);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator operator--(int) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator operator--(int) IPADDRESS_NOEXCEPT {
auto tmp = *this;
--(*this);
return tmp;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator+=(difference_type n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator+=(difference_type n) IPADDRESS_NOEXCEPT {
add(n);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator+=(const uint_type& n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator+=(const uint_type& n) IPADDRESS_NOEXCEPT {
add(n);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator-=(difference_type n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator-=(difference_type n) IPADDRESS_NOEXCEPT {
sub(n);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_address_iterator& operator-=(const uint_type& n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_address_iterator& operator-=(const uint_type& n) IPADDRESS_NOEXCEPT {
sub(n);
return *this;
}
Expand Down Expand Up @@ -420,8 +420,8 @@ class hosts_sequence<ip_address_base<Base>> {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_sequence(const hosts_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_sequence(hosts_sequence&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE hosts_sequence& operator=(const hosts_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE hosts_sequence& operator=(hosts_sequence&&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_sequence& operator=(const hosts_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_sequence& operator=(hosts_sequence&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_sequence(const_reference network_address, const_reference broadcast_address, size_t prefixlen, size_t max_prefixlen) IPADDRESS_NOEXCEPT {
if (prefixlen == max_prefixlen - 1) {
Expand Down
4 changes: 2 additions & 2 deletions include/ipaddress/ip-any-address.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ class ip_address {
*
* @param[in] ip The other ip_address object to swap with.
*/
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE void swap(ip_address& ip) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE void swap(ip_address& ip) IPADDRESS_NOEXCEPT {
const auto tmp = *this;
*this = ip;
ip = tmp;
Expand Down Expand Up @@ -1126,7 +1126,7 @@ class ip_address {
* @remark If scope is disabled in settings (`IPADDRESS_IPV6_SCOPE_MAX_LENGTH == 0`) then this call will have no effect.
*/
template <typename T, size_t N>
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE void set_scope_id(const T(&scope_id)[N]) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE void set_scope_id(const T(&scope_id)[N]) IPADDRESS_NOEXCEPT {
internal::is_char_type<T>();
if (_version == ip_version::V6) {
_ipv.ipv6.set_scope_id(scope_id);
Expand Down
28 changes: 14 additions & 14 deletions include/ipaddress/ip-any-iterator.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class ip_any_iterator {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator(const ip_any_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator(ip_any_iterator&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator=(const ip_any_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator=(ip_any_iterator&&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator=(const ip_any_iterator&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator=(ip_any_iterator&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator(Ipv4Iter iter) IPADDRESS_NOEXCEPT : _iter(iter), _version(ip_version::V4), _current(*iter) {
}
Expand Down Expand Up @@ -59,44 +59,44 @@ class ip_any_iterator {
return _version == ip_version::V4 ? value_type(_iter.iter4[uint32_t(n)]) : value_type(_iter.iter6[n]);
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator++() IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator++() IPADDRESS_NOEXCEPT {
add(1);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator operator++(int) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator operator++(int) IPADDRESS_NOEXCEPT {
auto tmp = *this;
++(*this);
return tmp;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator--() IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator--() IPADDRESS_NOEXCEPT {
sub(1);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator operator--(int) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator operator--(int) IPADDRESS_NOEXCEPT {
auto tmp = *this;
--(*this);
return tmp;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator+=(difference_type n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator+=(difference_type n) IPADDRESS_NOEXCEPT {
add(n);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator+=(const uint128_t& n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator+=(const uint128_t& n) IPADDRESS_NOEXCEPT {
add(n);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator-=(difference_type n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator-=(difference_type n) IPADDRESS_NOEXCEPT {
sub(n);
return *this;
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE ip_any_iterator& operator-=(const uint128_t& n) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE ip_any_iterator& operator-=(const uint128_t& n) IPADDRESS_NOEXCEPT {
sub(n);
return *this;
}
Expand Down Expand Up @@ -252,8 +252,8 @@ class hosts_any_sequence {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_any_sequence(const hosts_any_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_any_sequence(hosts_any_sequence&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE hosts_any_sequence& operator=(const hosts_any_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE hosts_any_sequence& operator=(hosts_any_sequence&&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_any_sequence& operator=(const hosts_any_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_any_sequence& operator=(hosts_any_sequence&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE hosts_any_sequence(ip_address_iterator<ipv4_address> begin, ip_address_iterator<ipv4_address> end) IPADDRESS_NOEXCEPT : _begin(begin), _end(end) {
}
Expand Down Expand Up @@ -342,8 +342,8 @@ class subnets_any_sequence {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE subnets_any_sequence(const subnets_any_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE subnets_any_sequence(subnets_any_sequence&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE subnets_any_sequence& operator=(const subnets_any_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE subnets_any_sequence& operator=(subnets_any_sequence&&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE subnets_any_sequence& operator=(const subnets_any_sequence&) IPADDRESS_NOEXCEPT = default;
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE subnets_any_sequence& operator=(subnets_any_sequence&&) IPADDRESS_NOEXCEPT = default;

IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE subnets_any_sequence(ip_network_iterator<ipv4_network> begin, ip_network_iterator<ipv4_network> end) IPADDRESS_NOEXCEPT : _begin(begin), _end(end) {
}
Expand Down
2 changes: 1 addition & 1 deletion include/ipaddress/ip-any-network.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class ip_network {
return is_v4() ? _ipv_net.ipv4.to_string(fmt) : _ipv_net.ipv6.to_string(fmt);
}

IPADDRESS_CONSTEXPR_14 IPADDRESS_FORCE_INLINE void swap(ip_network& net) IPADDRESS_NOEXCEPT {
IPADDRESS_CONSTEXPR IPADDRESS_FORCE_INLINE void swap(ip_network& net) IPADDRESS_NOEXCEPT {
const auto tmp = *this;
*this = net;
net = tmp;
Expand Down
Loading

0 comments on commit a2c0d68

Please sign in to comment.