diff options
Diffstat (limited to 'src/common/Asio/IpNetwork.h')
| -rw-r--r-- | src/common/Asio/IpNetwork.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/common/Asio/IpNetwork.h b/src/common/Asio/IpNetwork.h index 8ac84bfc30b..294532c5c78 100644 --- a/src/common/Asio/IpNetwork.h +++ b/src/common/Asio/IpNetwork.h @@ -20,11 +20,8 @@ #include "Define.h" #include "IpAddress.h" -#include <boost/version.hpp> -#if BOOST_VERSION >= 106600 #include <boost/asio/ip/network_v4.hpp> #include <boost/asio/ip/network_v6.hpp> -#endif namespace Trinity { @@ -32,13 +29,9 @@ namespace Trinity { inline bool IsInNetwork(boost::asio::ip::address_v4 const& networkAddress, boost::asio::ip::address_v4 const& mask, boost::asio::ip::address_v4 const& clientAddress) { -#if BOOST_VERSION >= 106600 boost::asio::ip::network_v4 network = boost::asio::ip::make_network_v4(networkAddress, mask); boost::asio::ip::address_v4_range hosts = network.hosts(); return hosts.find(clientAddress) != hosts.end(); -#else - return (clientAddress.to_ulong() & mask.to_ulong()) == (networkAddress.to_ulong() & mask.to_ulong()); -#endif } inline boost::asio::ip::address_v4 GetDefaultNetmaskV4(boost::asio::ip::address_v4 const& networkAddress) @@ -54,16 +47,9 @@ namespace Trinity inline bool IsInNetwork(boost::asio::ip::address_v6 const& networkAddress, uint16 prefixLength, boost::asio::ip::address_v6 const& clientAddress) { -#if BOOST_VERSION >= 106600 boost::asio::ip::network_v6 network = boost::asio::ip::make_network_v6(networkAddress, prefixLength); boost::asio::ip::address_v6_range hosts = network.hosts(); return hosts.find(clientAddress) != hosts.end(); -#else - (void)networkAddress; - (void)prefixLength; - (void)clientAddress; - return false; -#endif } } } |