From 6431129558fa9e4d1b3de8fc6439594cd01d53de Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 3 Jul 2016 00:08:18 +0200 Subject: std::auto_ptr is deprecated sinc C++0x use boost:scoped_ptr and boost::shared_ptr as a backwards compatiple replacement boost::bind problem with GCC-6 is still unfixed and all resolvers are commented out at the moment... --- src/resolver.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/resolver.cpp') diff --git a/src/resolver.cpp b/src/resolver.cpp index 346e5ef..81c30e3 100644 --- a/src/resolver.cpp +++ b/src/resolver.cpp @@ -141,29 +141,29 @@ void Resolver::resolveUdp(const std::string& addr, const std::string& port, UdpR { cLog.msg(Log::PRIO_DEBUG) << "trying to resolv UDP: '" << addr << "' '" << port << "'"; - std::auto_ptr query; + boost::shared_ptr query; if(addr != "") { switch(r) { case IPV4_ONLY: - query = std::auto_ptr(new udp::resolver::query(udp::v4(), addr, port)); + query = boost::shared_ptr(new udp::resolver::query(udp::v4(), addr, port)); break; case IPV6_ONLY: - query = std::auto_ptr(new udp::resolver::query(udp::v6(), addr, port)); + query = boost::shared_ptr(new udp::resolver::query(udp::v6(), addr, port)); break; default: - query = std::auto_ptr(new udp::resolver::query(addr, port)); + query = boost::shared_ptr(new udp::resolver::query(addr, port)); break; } } else { switch(r) { case IPV4_ONLY: - query = std::auto_ptr(new udp::resolver::query(udp::v4(), port)); + query = boost::shared_ptr(new udp::resolver::query(udp::v4(), port)); break; case IPV6_ONLY: - query = std::auto_ptr(new udp::resolver::query(udp::v6(), port)); + query = boost::shared_ptr(new udp::resolver::query(udp::v6(), port)); break; default: - query = std::auto_ptr(new udp::resolver::query(port)); + query = boost::shared_ptr(new udp::resolver::query(port)); break; } } @@ -175,29 +175,29 @@ void Resolver::resolveTcp(const std::string& addr, const std::string& port, TcpR { cLog.msg(Log::PRIO_DEBUG) << "trying to resolv TCP: '" << addr << "' '" << port << "'"; - std::auto_ptr query; + boost::shared_ptr query; if(addr != "") { switch(r) { case IPV4_ONLY: - query = std::auto_ptr(new tcp::resolver::query(tcp::v4(), addr, port)); + query = boost::shared_ptr(new tcp::resolver::query(tcp::v4(), addr, port)); break; case IPV6_ONLY: - query = std::auto_ptr(new tcp::resolver::query(tcp::v6(), addr, port)); + query = boost::shared_ptr(new tcp::resolver::query(tcp::v6(), addr, port)); break; default: - query = std::auto_ptr(new tcp::resolver::query(addr, port)); + query = boost::shared_ptr(new tcp::resolver::query(addr, port)); break; } } else { switch(r) { case IPV4_ONLY: - query = std::auto_ptr(new tcp::resolver::query(tcp::v4(), port)); + query = boost::shared_ptr(new tcp::resolver::query(tcp::v4(), port)); break; case IPV6_ONLY: - query = std::auto_ptr(new tcp::resolver::query(tcp::v6(), port)); + query = boost::shared_ptr(new tcp::resolver::query(tcp::v6(), port)); break; default: - query = std::auto_ptr(new tcp::resolver::query(port)); + query = boost::shared_ptr(new tcp::resolver::query(port)); break; } } -- cgit v1.2.3