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...

6 files changed, 28 insertions, 27 deletions

diff --git a/src/anytun-config.cpp b/src/anytun-config.cpp
index b305dc6..ff36487 100644
--- a/src/anytun-config.cpp
+++ b/src/anytun-config.cpp
@@ -139,10 +139,10 @@ int main(int argc, char* argv[])
   int ret = 0;
   UDPPacketSource::proto::endpoint endpoint;
   // allow emtpy endpoint!!!
-  gResolver.resolveUdp(gOpt.getRemoteAddr(), gOpt.getRemotePort(),
-                       boost::bind(createConnectionResolver, _1, boost::ref(cl), gOpt.getSeqWindowSize(), boost::ref(queue), gOpt.getMux(), boost::ref(sem)),
-                       boost::bind(createConnectionError, _1, boost::ref(sem), boost::ref(ret)),
-                       gOpt.getResolvAddrType());
+//  gResolver.resolveUdp(gOpt.getRemoteAddr(), gOpt.getRemotePort(),
+//                       boost::bind(createConnectionResolver, _1, boost::ref(cl), gOpt.getSeqWindowSize(), boost::ref(queue), gOpt.getMux(), boost::ref(sem)),
+//                       boost::bind(createConnectionError, _1, boost::ref(sem), boost::ref(ret)),
+//                       gOpt.getResolvAddrType());
   sem.down();
   return ret;
 }
diff --git a/src/anytun.cpp b/src/anytun.cpp
index 3f14a5e..909313d 100644
--- a/src/anytun.cpp
+++ b/src/anytun.cpp
@@ -46,6 +46,7 @@
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
 #include <boost/assign.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <iostream>
 #include <fstream>
 
@@ -151,8 +152,8 @@ void sender(TunDevice* dev, PacketSource* src)
   }
 
   try {
-    std::auto_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_OUTBOUND));
-    std::auto_ptr<AuthAlgo> a(AuthAlgoFactory::create(gOpt.getAuthAlgo(), KD_OUTBOUND));
+    boost::scoped_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_OUTBOUND));
+    boost::scoped_ptr<AuthAlgo> a(AuthAlgoFactory::create(gOpt.getAuthAlgo(), KD_OUTBOUND));
 
     PlainPacket plain_packet(MAX_PACKET_LENGTH);
     EncryptedPacket encrypted_packet(MAX_PACKET_LENGTH, gOpt.getAuthTagLength());
@@ -243,8 +244,8 @@ void receiver(TunDevice* dev, PacketSource* src)
   }
 
   try {
-    std::auto_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_INBOUND));
-    std::auto_ptr<AuthAlgo> a(AuthAlgoFactory::create(gOpt.getAuthAlgo(), KD_INBOUND));
+    boost::scoped_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_INBOUND));
+    boost::scoped_ptr<AuthAlgo> a(AuthAlgoFactory::create(gOpt.getAuthAlgo(), KD_INBOUND));
 
     uint32_t auth_tag_length = gOpt.getAuthTagLength();
     EncryptedPacket encrypted_packet(MAX_PACKET_LENGTH, auth_tag_length);
@@ -433,7 +434,7 @@ int main(int argc, char* argv[])
     PacketSource* src = new UDPPacketSource(gOpt.getLocalAddr(), gOpt.getLocalPort());
 
     if(gOpt.getRemoteAddr() != "") {
-      gResolver.resolveUdp(gOpt.getRemoteAddr(), gOpt.getRemotePort(), boost::bind(createConnectionResolver, _1, gOpt.getSeqWindowSize(), gOpt.getMux()), boost::bind(createConnectionError, _1), gOpt.getResolvAddrType());
+      //gResolver.resolveUdp(gOpt.getRemoteAddr(), gOpt.getRemotePort(), boost::bind(createConnectionResolver, _1, gOpt.getSeqWindowSize(), gOpt.getMux()), boost::bind(createConnectionError, _1), gOpt.getResolvAddrType());
     }
 
     HostList connect_to = gOpt.getRemoteSyncHosts();
diff --git a/src/configure b/src/configure
index 18f0306..fb2fcae 100755
--- a/src/configure
+++ b/src/configure
@@ -206,8 +206,8 @@ if [ -n "$ERRORS" ] && [ $EBUILD_COMPAT -ne 1 ]; then
 fi
 
 if [ $USE_CLANG -eq 0 ]; then
-  CXXFLAGS='-g -Wall -O2'
-  LDFLAGS='-g -Wall -O2'
+  CXXFLAGS='-g -Wall -Werror -O2'
+  LDFLAGS='-g -Wall -Werror -O2'
   COMPILER='g++'
 else
   CXXFLAGS='-g -O2'
diff --git a/src/packetSource.cpp b/src/packetSource.cpp
index 882938f..8357c64 100644
--- a/src/packetSource.cpp
+++ b/src/packetSource.cpp
@@ -62,7 +62,7 @@ void PacketSource::waitUntilReady()
 
 UDPPacketSource::UDPPacketSource(std::string localaddr, std::string port)
 {
-  gResolver.resolveUdp(localaddr, port, boost::bind(&UDPPacketSource::onResolve, this, _1), boost::bind(&UDPPacketSource::onError, this, _1), gOpt.getResolvAddrType());
+//  gResolver.resolveUdp(localaddr, port, boost::bind(&UDPPacketSource::onResolve, this, _1), boost::bind(&UDPPacketSource::onError, this, _1), gOpt.getResolvAddrType());
 }
 
 UDPPacketSource::~UDPPacketSource()
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;
     }
   }
diff --git a/src/syncServer.cpp b/src/syncServer.cpp
index 35ad3f2..0c2b2b8 100644
--- a/src/syncServer.cpp
+++ b/src/syncServer.cpp
@@ -53,7 +53,7 @@
 SyncServer::SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect)
   : onConnect_(onConnect)
 {
-  gResolver.resolveTcp(localaddr, port, boost::bind(&SyncServer::onResolve, this, _1), boost::bind(&SyncServer::onResolvError, this, _1));
+//  gResolver.resolveTcp(localaddr, port, boost::bind(&SyncServer::onResolve, this, _1), boost::bind(&SyncServer::onResolvError, this, _1));
 }
 
 SyncServer::~SyncServer()