Remove deprecated ip::address member functions.

Author: chriskohlhoff

include/boost/asio/ip/address.hpp

@@ -100,32 +100,6 @@ class address
   /// Get the address as a string.
   BOOST_ASIO_DECL std::string to_string() const;
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-  /// (Deprecated: Use other overload.) Get the address as a string.
-  BOOST_ASIO_DECL std::string to_string(boost::system::error_code& ec) const;
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(const char* str);
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(const char* str, boost::system::error_code& ec);
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(const std::string& str);
-
-  /// (Deprecated: Use make_address().) Create an address from an IPv4 address
-  /// string in dotted decimal form, or from an IPv6 address in hexadecimal
-  /// notation.
-  static address from_string(
-      const std::string& str, boost::system::error_code& ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
   /// Determine whether the address is a loopback address.
   BOOST_ASIO_DECL bool is_loopback() const noexcept;
 

include/boost/asio/ip/impl/address.hpp

@@ -17,40 +17,12 @@
 
 #if !defined(BOOST_ASIO_NO_IOSTREAM)
 
-#include <boost/asio/detail/throw_error.hpp>
-
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 namespace ip {
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-
-inline address address::from_string(const char* str)
-{
-  return boost::asio::ip::make_address(str);
-}
-
-inline address address::from_string(
-    const char* str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address(str, ec);
-}
-
-inline address address::from_string(const std::string& str)
-{
-  return boost::asio::ip::make_address(str);
-}
-
-inline address address::from_string(
-    const std::string& str, boost::system::error_code& ec)
-{
-  return boost::asio::ip::make_address(str, ec);
-}
-
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 template <typename Elem, typename Traits>
 std::basic_ostream<Elem, Traits>& operator<<(
     std::basic_ostream<Elem, Traits>& os, const address& addr)

include/boost/asio/ip/impl/address.ipp

@@ -178,15 +178,6 @@ std::string address::to_string() const
   return ipv4_address_.to_string();
 }
 
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-std::string address::to_string(boost::system::error_code& ec) const
-{
-  if (type_ == ipv6)
-    return ipv6_address_.to_string(ec);
-  return ipv4_address_.to_string(ec);
-}
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
 bool address::is_loopback() const noexcept
 {
   return (type_ == ipv4)

test/ip/address.cpp

@@ -69,18 +69,6 @@ void test()
     (void)addr_v6_value;
 
     std::string string_value = addr1.to_string();
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-    string_value = addr1.to_string(ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-
-    // address static functions.
-
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-    addr1 = ip::address::from_string("127.0.0.1");
-    addr1 = ip::address::from_string("127.0.0.1", ec);
-    addr1 = ip::address::from_string(string_value);
-    addr1 = ip::address::from_string(string_value, ec);
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
     // address comparisons.