diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 12:30:21 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 12:30:21 +0100 |
| commit | 8d2ab4cfecaefd6f10bee548112e3e0740670c9d (patch) | |
| tree | f05e6b9464bd3e8ad6f9851bdbd5924c57ab5fbd | |
| parent | a2a22b58ede100a0d64266ec1838936cd94b6dd7 (diff) | |
| download | ATCD-8d2ab4cfecaefd6f10bee548112e3e0740670c9d.tar.gz | |
Use std::unique_ptr
* TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
* TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h:
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index a8f195f9648..fe79fa3d85a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -16,8 +16,6 @@ #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Trader/Trading_Loader.h" -#include <utility> - #include "orbsvcs/Daemon_Utilities.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index 0eae04554d0..c8b32f9ca33 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -27,7 +27,7 @@ #include "tao/Object_Loader.h" #include "tao/Utils/ORB_Manager.h" -#include "ace/Auto_Ptr.h" +#include <utility> class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader { @@ -56,7 +56,6 @@ public: ACE_TCHAR *argv[]); protected: - /// Enable the Trading Service to answer multicast requests for its /// IOR. int init_multicast_server (void); @@ -71,7 +70,7 @@ protected: TAO_ORB_Manager orb_manager_; /// Pointer to the linked trader. - auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader_; + std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> trader_; /// Service Type Repository used by the trading service. TAO_Service_Type_Repository type_repos_; @@ -97,8 +96,8 @@ protected: private: // Disallow copying and assignment. - TAO_Trading_Loader (const TAO_Trading_Loader &); - TAO_Trading_Loader &operator= (const TAO_Trading_Loader &); + TAO_Trading_Loader (const TAO_Trading_Loader &) = delete; + TAO_Trading_Loader &operator= (const TAO_Trading_Loader &) = delete; }; ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader) |