Avoid using swap to initialize boost:shared_ptr members.

diff --git a/src/config.cpp b/src/config.cpp
index 149d5c8..89fcbfc 100644 (file)
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -91,20 +91,17 @@ Config::Config()
     ;
 
     // Define valid command line parameters
-    Options_descriptionPtr _opt_desc_cmd(new po::options_description("Command line options"));
-    OptDescCmd.swap(_opt_desc_cmd);
+    OptDescCmd = Options_descriptionPtr(new po::options_description("Command line options"));
     OptDescCmd->add(opt_desc_cmd_only);
     OptDescCmd->add(opt_desc_generic);
     OptDescCmd->add(opt_desc_service);
 
     // Define valid config file options
-    Options_descriptionPtr _opt_desc_conf_main(new po::options_description("Config file options"));
-    OptDescConfMain.swap(_opt_desc_conf_main);
+    OptDescConfMain = Options_descriptionPtr(new po::options_description("Config file options"));
     OptDescConfMain->add(opt_desc_generic);
 
     // Define valid service file options
-    Options_descriptionPtr _opt_desc_conf_service(new po::options_description("Service file options"));
-    OptDescConfService.swap(_opt_desc_conf_service);
+    OptDescConfService = Options_descriptionPtr(new po::options_description("Service file options"));
     OptDescConfService->add(opt_desc_service);
 }
 
@@ -163,20 +160,17 @@ Config::Config(Logger::Ptr _log, Serviceholder::Ptr _serviceholder)
     ;
 
     // Define valid command line parameters
-    Options_descriptionPtr _opt_desc_cmd(new po::options_description("Command line options"));
-    OptDescCmd.swap(_opt_desc_cmd);
+    OptDescCmd = Options_descriptionPtr(new po::options_description("Command line options"));
     OptDescCmd->add(opt_desc_cmd_only);
     OptDescCmd->add(opt_desc_generic);
     OptDescCmd->add(opt_desc_service);
 
     // Define valid config file options
-    Options_descriptionPtr _opt_desc_conf_main(new po::options_description("Config file options"));
-    OptDescConfMain.swap(_opt_desc_conf_main);
+    OptDescConfMain = Options_descriptionPtr(new po::options_description("Config file options"));
     OptDescConfMain->add(opt_desc_generic);
 
     // Define valid service file options
-    Options_descriptionPtr _opt_desc_conf_service(new po::options_description("Service file options"));
-    OptDescConfService.swap(_opt_desc_conf_service);
+    OptDescConfService = Options_descriptionPtr(new po::options_description("Service file options"));
     OptDescConfService->add(opt_desc_service);
 }
 

diff --git a/src/main.cpp b/src/main.cpp
index 163e96b..bc9ebb9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -254,9 +254,7 @@ int init_daemon_mode(bool daemon_mode)
 int main(int argc, char *argv[])
 {
     // initialize Updater
-    Updater::Ptr _updater(new Updater);
-    updater.swap(_updater);
-    _updater.reset();
+    updater = Updater::Ptr(new Updater);
 
     // load config and initialize helper classes
     if ( updater->load_config(argc,argv) != 0 )

diff --git a/src/net_helper.cpp b/src/net_helper.cpp
index 3d6039d..cbfa659 100644 (file)
--- a/src/net_helper.cpp
+++ b/src/net_helper.cpp
@@ -20,8 +20,7 @@ using namespace std;
 NetHelper::NetHelper()
     : Log(new Logger())
 {
-    IPService::Ptr _ip_service_ptr(new TCPService());
-    IPServicePtr.swap(_ip_service_ptr);
+    IPServicePtr = IPService::Ptr(new TCPService());
 }
 
 
@@ -32,8 +31,7 @@ NetHelper::NetHelper()
 NetHelper::NetHelper( const Logger::Ptr _log )
     : Log(_log)
 {
-    IPService::Ptr _ip_service_ptr(new TCPService());
-    IPServicePtr.swap(_ip_service_ptr);
+    IPServicePtr = IPService::Ptr(new TCPService());
 }
 
 

diff --git a/src/service_dhs.cpp b/src/service_dhs.cpp
index 578a0a9..fa4df6f 100644 (file)
--- a/src/service_dhs.cpp
+++ b/src/service_dhs.cpp
@@ -57,8 +57,7 @@ ServiceDhs::ServiceDhs(const string& _protocol, const string& _hostname, const s
     set_logger(_logger);
 
     // create http helper class
-    HTTPHelper::Ptr _http_help(new HTTPHelper(_logger,_proxy,_proxy_port,_login,_password));
-    HTTPHelp.swap(_http_help);
+    HTTPHelp = HTTPHelper::Ptr(new HTTPHelper(_logger,_proxy,_proxy_port,_login,_password));
 
     // extract domain part from hostname
     list<string> host_domain_part = separate_domain_and_host_part(get_hostname());

diff --git a/src/serviceholder.cpp b/src/serviceholder.cpp
index 7dfadc6..906f29a 100644 (file)
--- a/src/serviceholder.cpp
+++ b/src/serviceholder.cpp
@@ -136,8 +136,7 @@ int Serviceholder::deserialize_services()
             return -1;
         }
         SerializeServiceContainer::Ptr service_container(_service_container);
-        IPAddrHelper::Ptr ip_addr_helper(_ip_addr_helper);
-        IPAddrHelp.swap(ip_addr_helper);
+        IPAddrHelp = IPAddrHelper::Ptr(_ip_addr_helper);
         ifs.close();
 
         // Get the list of old Services from de-serialized SerializeServiceContainer object.

diff --git a/src/tcp_service.cpp b/src/tcp_service.cpp
index 995e452..907b186 100644 (file)
--- a/src/tcp_service.cpp
+++ b/src/tcp_service.cpp
@@ -62,8 +62,7 @@ void TCPService::connect(const std::string& _host, const std::string& _port) thr
     ctx.set_verify_mode(boost::asio::ssl::context::verify_none);
 
     // Initialize the member Socket
-    SocketPtr _socket_ptr(new SSLStream(IOService,ctx));
-    Socket.swap(_socket_ptr);
+    Socket = SocketPtr(new SSLStream(IOService,ctx));
 
     // Try to connect the Socket through all available endpoints
     if (endpoint_iterator != end)

diff --git a/src/updater.cpp b/src/updater.cpp
index 3d18418..5a65c68 100644 (file)
--- a/src/updater.cpp
+++ b/src/updater.cpp
@@ -26,16 +26,13 @@ Updater::Updater()
     : IPAddrHelp(new IPAddrHelper)
 {
     // Initialize program wide Logger, at this point we don't know where to log and with which loglevel.
-    Logger::Ptr _log(new Logger);
-    Log.swap(_log);
+    Log = Logger::Ptr(new Logger);
 
     // initialize Serviceholder
-    Serviceholder::Ptr _serviceholder(new Serviceholder(Log));
-    ServiceHolder.swap(_serviceholder);
+    ServiceHolder = Serviceholder::Ptr(new Serviceholder(Log));
 
     // initialize Config
-    Config::Ptr _config(new Config(Log,ServiceHolder));
-    Conf.swap(_config);
+    Conf = Config::Ptr(new Config(Log,ServiceHolder));
 }
 
 
@@ -168,14 +165,12 @@ int Updater::init_ip_helper()
     if ( _ip_addr_help.use_count() != 0 )
     {
         // Initialize IPHelper
-        IPAddrHelper::Ptr ip_addr_help( new IPAddrHelper( Log, Conf->get_webcheck_ip_url(), Conf->get_webcheck_ip_url_alt(), Conf->get_webcheck_interval(), _ip_addr_help->get_last_webcheck(), Conf->get_enable_ipv6(), Conf->get_proxy(), Conf->get_proxy_port() ) );
-        IPAddrHelp.swap(ip_addr_help);
+        IPAddrHelp = IPAddrHelper::Ptr( new IPAddrHelper( Log, Conf->get_webcheck_ip_url(), Conf->get_webcheck_ip_url_alt(), Conf->get_webcheck_interval(), _ip_addr_help->get_last_webcheck(), Conf->get_enable_ipv6(), Conf->get_proxy(), Conf->get_proxy_port() ) );
     }
     else
     {
         // IPAddrHelper from ServiceHolder was not declared, so init oen with LastWebcheck 0
-        IPAddrHelper::Ptr ip_addr_help( new IPAddrHelper( Log, Conf->get_webcheck_ip_url(), Conf->get_webcheck_ip_url_alt(), Conf->get_webcheck_interval(), 0, Conf->get_enable_ipv6(), Conf->get_proxy(), Conf->get_proxy_port() ) );
-        IPAddrHelp.swap(ip_addr_help);
+        IPAddrHelp = IPAddrHelper::Ptr( new IPAddrHelper( Log, Conf->get_webcheck_ip_url(), Conf->get_webcheck_ip_url_alt(), Conf->get_webcheck_interval(), 0, Conf->get_enable_ipv6(), Conf->get_proxy(), Conf->get_proxy_port() ) );
     }
 
     // Put the IPAddrHelper into ServiceHolder, so the LastWebcheck state will be serialized too.