summaryrefslogtreecommitdiff
path: root/src/resolver.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2016-07-03 00:08:18 +0200
committerChristian Pointner <equinox@anytun.org>2016-07-03 01:31:22 +0200
commit6431129558fa9e4d1b3de8fc6439594cd01d53de (patch)
treecafb483a2ba60dc8a9452d62d837e29115820607 /src/resolver.cpp
parentupdated some info after moving to GIT (diff)
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...
Diffstat (limited to 'src/resolver.cpp')
-rw-r--r--src/resolver.cpp28
1 files changed, 14 insertions, 14 deletions
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<udp::resolver::query> query;
+ boost::shared_ptr<udp::resolver::query> query;
if(addr != "") {
switch(r) {
case IPV4_ONLY:
- query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), addr, port));
+ query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), addr, port));
break;
case IPV6_ONLY:
- query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), addr, port));
+ query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), addr, port));
break;
default:
- query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(addr, port));
+ query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(addr, port));
break;
}
} else {
switch(r) {
case IPV4_ONLY:
- query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), port));
+ query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), port));
break;
case IPV6_ONLY:
- query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), port));
+ query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), port));
break;
default:
- query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(port));
+ query = boost::shared_ptr<udp::resolver::query>(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<tcp::resolver::query> query;
+ boost::shared_ptr<tcp::resolver::query> query;
if(addr != "") {
switch(r) {
case IPV4_ONLY:
- query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), addr, port));
+ query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), addr, port));
break;
case IPV6_ONLY:
- query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), addr, port));
+ query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), addr, port));
break;
default:
- query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(addr, port));
+ query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(addr, port));
break;
}
} else {
switch(r) {
case IPV4_ONLY:
- query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), port));
+ query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), port));
break;
case IPV6_ONLY:
- query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), port));
+ query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), port));
break;
default:
- query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(port));
+ query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(port));
break;
}
}