diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-04-29 18:33:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-29 18:33:00 +0200 |
commit | fb9a4a0fab263d90bcfdbfef4be5a4b4dd1eb6d7 (patch) | |
tree | bcd8bcaab0590693acc77214d901d02cbaedc227 | |
parent | 10f275eb348168ee2e76824bd4f63eed9aa74448 (diff) | |
parent | e34b94be98ca81f5a9640b896e1cf983bb3ea768 (diff) | |
download | ATCD-fb9a4a0fab263d90bcfdbfef4be5a4b4dd1eb6d7.tar.gz |
Merge pull request #1487 from jwillemsen/jwi-autoptrunimpl
Removed not used auto_ptr member, use delete, layout changes, fixed typos
26 files changed, 92 insertions, 163 deletions
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h index d8ebe216bbb..adac931146a 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h @@ -88,7 +88,7 @@ public: int send_peers (ACE_Message_Block *mb); protected: -// Handle control messages arriving from adjacent Modules. + // Handle control messages arriving from adjacent Modules. virtual int control (ACE_Message_Block *); // Map used to keep track of active peers. @@ -102,9 +102,8 @@ protected: Acceptor_Factory<PEER_HANDLER, PEER_KEY> *acceptor_; private: -// Prevent copies and pass-by-value. - ACE_UNIMPLEMENTED_FUNC (Peer_Router (const Peer_Router<PEER_HANDLER, PEER_KEY> &)) - ACE_UNIMPLEMENTED_FUNC (void operator= (const Peer_Router<PEER_HANDLER, PEER_KEY> &)) + Peer_Router (const Peer_Router<PEER_HANDLER, PEER_KEY> &) = delete; + void operator= (const Peer_Router<PEER_HANDLER, PEER_KEY> &) = delete; }; #if defined (__ACE_INLINE__) diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h index 2315741ae7e..fe67a61a1d0 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.h +++ b/ACE/netsvcs/lib/Log_Message_Receiver.h @@ -158,9 +158,9 @@ public: ACE_Log_Record &record, ostream *output); private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const Log_Message_Receiver<ACE_SYNCH_USE> &rhs)) + void operator= (const Log_Message_Receiver<ACE_SYNCH_USE> &rhs) = delete; - // Attributes. + /// Attributes Log_Message_Receiver_Impl<ACE_SYNCH_USE> *receiver_impl_; }; @@ -196,8 +196,8 @@ private: #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) static ACE_SYNCH_MUTEX_T copy_lock_; #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ - ACE_UNIMPLEMENTED_FUNC (void operator= (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &)) - ACE_UNIMPLEMENTED_FUNC (Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &)) + void operator= (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &) = delete; + Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &) = delete; }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp index 6c11f893bb8..ce04311b7e4 100644 --- a/ACE/performance-tests/TCP/tcp_test.cpp +++ b/ACE/performance-tests/TCP/tcp_test.cpp @@ -125,9 +125,9 @@ private: /// The address to send messages to. ACE_INET_Addr remote_addr_; - ACE_UNIMPLEMENTED_FUNC (Client (void)) - ACE_UNIMPLEMENTED_FUNC (Client (const Client &)) - ACE_UNIMPLEMENTED_FUNC (Client &operator= (const Client &)) + Client () = delete; + Client (const Client &) = delete; + Client &operator= (const Client &) = delete; }; Client::Client (const ACE_INET_Addr &remote_addr) @@ -304,9 +304,9 @@ private: /// Receives datagrams. ACE_SOCK_Stream endpoint_; - ACE_UNIMPLEMENTED_FUNC (Server (void)) - ACE_UNIMPLEMENTED_FUNC (Server (const Server &)) - ACE_UNIMPLEMENTED_FUNC (Server &operator= (const Server &)) + Server (void) = delete; + Server (const Server &) = delete; + Server &operator= (const Server &) = delete; }; Server::Server (const ACE_INET_Addr &addr) diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp index cb6793475ee..753f9f15fcd 100644 --- a/ACE/performance-tests/UDP/udp_test.cpp +++ b/ACE/performance-tests/UDP/udp_test.cpp @@ -117,9 +117,9 @@ private: /// The address to send messages to. ACE_INET_Addr remote_addr_; - ACE_UNIMPLEMENTED_FUNC (Client (void)) - ACE_UNIMPLEMENTED_FUNC (Client (const Client &)) - ACE_UNIMPLEMENTED_FUNC (Client &operator= (const Client &)) + Client (void) = delete; + Client (const Client &) = delete; + Client &operator= (const Client &) = delete; }; Client::Client (const ACE_INET_Addr &addr, @@ -481,9 +481,9 @@ private: /// Receives datagrams. ACE_SOCK_Dgram endpoint_; - ACE_UNIMPLEMENTED_FUNC (Server (void)) - ACE_UNIMPLEMENTED_FUNC (Server (const Server &)) - ACE_UNIMPLEMENTED_FUNC (Server &operator= (const Server &)) + Server (void) = delete; + Server (const Server &) = delete; + Server &operator= (const Server &) = delete; }; Server::Server (const ACE_INET_Addr &addr) diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index be38354ffdf..cc1401aa540 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -70,8 +70,8 @@ private: // Errors count, set in svc() and returned from open(). ACE_Atomic_Op<ACE_Thread_Mutex, int> errors_; - ACE_UNIMPLEMENTED_FUNC (Token_Strategy_Test (const Token_Strategy_Test &)) - ACE_UNIMPLEMENTED_FUNC (Token_Strategy_Test &operator= (const Token_Strategy_Test &)) + Token_Strategy_Test (const Token_Strategy_Test &) = delete; + Token_Strategy_Test &operator= (const Token_Strategy_Test &) = delete; }; diff --git a/TAO/orbsvcs/Trading_Service/README b/TAO/orbsvcs/Trading_Service/README index f8f7dad632a..63916fb7c71 100644 --- a/TAO/orbsvcs/Trading_Service/README +++ b/TAO/orbsvcs/Trading_Service/README @@ -1,10 +1,8 @@ - - The TAO Trading Service Thank you for your interest in the TAO trading service. Documentation on using the Trading Service and its tests can be found in: - $TAO_ROOT/docs/releasenotes/trader.html +$TAO_ROOT/docs/releasenotes/trader.html -Enjoy!
\ No newline at end of file +Enjoy! diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp index 10fa4ba2c46..a5a16db7282 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" // Driver function for the TAO Trading Service. - int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { @@ -11,7 +10,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) try { - int check = trader.init (argc, argv); + int const check = trader.init (argc, argv); if (check != -1) { diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 16e00596670..ca175391239 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -30,12 +30,7 @@ Trading_Shutdown::handle_signal (int, return 0; } -Trading_Service::Trading_Service (void) -{ - // constructor -} - -Trading_Service::~Trading_Service (void) +Trading_Service::~Trading_Service () { this->shutdown (); } @@ -52,7 +47,7 @@ Trading_Service::init (int argc, ACE_TCHAR *argv[]) } int -Trading_Service::run (void) +Trading_Service::run () { Trading_Shutdown trading_shutdown (*this); @@ -60,7 +55,7 @@ Trading_Service::run (void) } int -Trading_Service::shutdown (void) +Trading_Service::shutdown () { // Invoke TAO_Trading_Loader::fini () int const shutdown_result = this->trading_loader_.fini (); diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h index 8caed4cca02..55b8cb5ac5c 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.h +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h @@ -12,7 +12,6 @@ #ifndef _TRADING_SERVICE_H #define _TRADING_SERVICE_H -#include "ace/Auto_Ptr.h" #include "ace/Sig_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -55,27 +54,20 @@ protected: class Trading_Service { public: + Trading_Service () = default; - /// Default constructor. - Trading_Service (void); - - /// Destructor - ~Trading_Service (void); + ~Trading_Service (); /// Initialize the Trading Service with arguments. int init (int argc, ACE_TCHAR *argv[]); /// Run the Trading Service. - int run (void); + int run (); - int shutdown (void); + int shutdown (); protected: - - /// Pointer to the linked trader. - auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader_; - /// Instance of TAO_Trading_Laoder TAO_Trading_Loader trading_loader_; }; diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index d4c87aa11b6..031f401980d 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -26,7 +26,7 @@ class DynServer_ORB_Runner; class DynServer_Export DynServer_Loader : public TAO_Object_Loader { public: - DynServer_Loader(void); + DynServer_Loader(); // spawns a thread to run an internal orb which has activated // a single DynServer servant. @@ -47,8 +47,8 @@ private: ACE_Auto_Ptr<DynServer_ORB_Runner> runner_; private: - ACE_UNIMPLEMENTED_FUNC (DynServer_Loader (const DynServer_Loader &)) - ACE_UNIMPLEMENTED_FUNC (DynServer_Loader &operator = (const DynServer_Loader &)) + DynServer_Loader (const DynServer_Loader &) = delete; + DynServer_Loader &operator = (const DynServer_Loader &) = delete; }; ACE_FACTORY_DECLARE (DynServer, DynServer_Loader) diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 52dc4412cc4..fe9a15c330c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -1020,8 +1020,8 @@ protected: #if defined (ACE_WIN32_VC14) // Workaround for connect issue 1577211 - ACE_UNIMPLEMENTED_FUNC (TAO_FlowEndPoint (const TAO_FlowEndPoint &)) - ACE_UNIMPLEMENTED_FUNC (TAO_FlowEndPoint &operator= (const TAO_FlowEndPoint &)) + TAO_FlowEndPoint (const TAO_FlowEndPoint &) = delete; + TAO_FlowEndPoint &operator= (const TAO_FlowEndPoint &) = delete; #endif }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index b48aa8e55f7..836310c2a3e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -70,8 +70,7 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator) TAO_Preference_Interpreter::TAO_Preference_Interpreter ( const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* preference - ) + const char* preference) : TAO_Interpreter () { TAO_Trader_Constraint_Validator type_checker (ts); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 6905df54a60..1014f848399 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -56,7 +56,7 @@ public: const char* constraints); /// Destructor - ~TAO_Constraint_Interpreter (void); + ~TAO_Constraint_Interpreter (); CORBA::Boolean evaluate (CosTrading::Offer* offer); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index d10e0e61d3b..1d95f7eba8e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -62,7 +62,7 @@ public: /// Return the expression type represented by this node. virtual TAO_Expression_Type expr_type () const = 0; - virtual ~TAO_Constraint (void) {} + virtual ~TAO_Constraint () {} }; /** @@ -100,7 +100,7 @@ public: virtual int accept (TAO_Constraint_Visitor* visitor); - virtual ~TAO_Binary_Constraint (void); + virtual ~TAO_Binary_Constraint (); virtual TAO_Expression_Type expr_type () const { return this->op_; } @@ -248,7 +248,6 @@ public: // Return the type represented by this MysteryOperand. // = Comparison operators. - friend TAO_Trading_Serv_Export bool operator< (const TAO_Literal_Constraint& left, const TAO_Literal_Constraint& right); @@ -312,7 +311,6 @@ public: comparable_type (CORBA::TypeCode_ptr type); private: - /// Private copy method. void copy (const TAO_Literal_Constraint& co); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index c4546897636..e87b992b6a9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -48,8 +48,7 @@ class TAO_Noop_Constraint; class TAO_Trading_Serv_Export TAO_Constraint_Visitor { public: - - virtual ~TAO_Constraint_Visitor (void) {} + virtual ~TAO_Constraint_Visitor () {} virtual int visit_constraint (TAO_Unary_Constraint* constraint) = 0; @@ -115,10 +114,10 @@ class TAO_Trading_Serv_Export TAO_Constraint_Validator : public TAO_Constraint_V { public: /// Constructor. - TAO_Constraint_Validator (void); + TAO_Constraint_Validator (); /// Destructor. - virtual ~TAO_Constraint_Validator (void); + virtual ~TAO_Constraint_Validator (); /** * Validate returns 1 if the expression tree whose root is <root> @@ -177,13 +176,11 @@ public: virtual int visit_property (TAO_Property_Constraint* literal); protected: - /// A map gleaned from the ServiceTypeStruct, which correlates /// property names with their types. TAO_Typecode_Table type_map_; private: - CORBA::TypeCode* extract_type (TAO_Constraint* expr_type, TAO_Expression_Type& type); @@ -224,9 +221,8 @@ private: class TAO_Trading_Serv_Export TAO_Constraint_Evaluator : public TAO_Constraint_Visitor { public: - /// Constructor. - TAO_Constraint_Evaluator (void); + TAO_Constraint_Evaluator (); /** * Evaluate returns 1 if the offer satisfies the constraints @@ -309,7 +305,6 @@ public: virtual int visit_property (TAO_Property_Constraint* literal); private: - class TAO_Trading_Serv_Export Operand_Queue : public ACE_Unbounded_Queue <TAO_Literal_Constraint> // = TITLE @@ -317,20 +312,19 @@ private: // from the expression evaluation results. { public: - - Operand_Queue (void); + Operand_Queue (); /// In a binary operation, obtain the left operand. - TAO_Literal_Constraint& get_left_operand (void); + TAO_Literal_Constraint& get_left_operand (); /// In a binary operation, obtain the right operand. - TAO_Literal_Constraint& get_right_operand (void); + TAO_Literal_Constraint& get_right_operand (); /// In a unary operation, obtain the only operand. - TAO_Literal_Constraint& get_operand (void); + TAO_Literal_Constraint& get_operand (); /// Remove an operand from the queue. - void dequeue_operand (void); + void dequeue_operand (); }; /// Method for performing a arithmetic or comparison operation. @@ -419,7 +413,6 @@ public: /// uses the appropriate form of equals comparison. int operator () (TAO_DynSequence_i& dyn_any, CORBA::ULongLong element) const; - }; template<> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index bb675e18a5c..2d056734fcc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -55,9 +55,9 @@ public: typedef TAO_Service_Offer_Iterator<LOCK_TYPE> offer_iterator; /// No arg constructor. - TAO_Offer_Database (void); + TAO_Offer_Database (); - ~TAO_Offer_Database (void); + ~TAO_Offer_Database (); /// Add an offer of type @ type and generate a CosTrading::OfferId /// for it. Returns 0 on failure. @@ -100,7 +100,6 @@ public: Offer_Database; private: - // The internal id is a pointer here, not only to avoid copying, // since we would only copy on insertion, and we only insert once // --- with an empty Offer_Map_Entry --- but also since most locks @@ -130,8 +129,8 @@ private: CORBA::ULong& id); // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Offer_Database<LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Offer_Database (const TAO_Offer_Database<LOCK_TYPE> &)) + void operator= (const TAO_Offer_Database<LOCK_TYPE> &) = delete; + TAO_Offer_Database (const TAO_Offer_Database<LOCK_TYPE> &) = delete; LOCK_TYPE db_lock_; @@ -150,8 +149,7 @@ private: template <class LOCK_TYPE> class TAO_Service_Offer_Iterator { - public: - +public: typedef TAO_Offer_Database<LOCK_TYPE> Offer_Database; TAO_Service_Offer_Iterator (const char* type, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index b915e373f07..ae5b660b3b3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -51,7 +51,6 @@ class TAO_Trader_Base; class TAO_Trading_Serv_Export TAO_Trader_Factory { public: - typedef TAO_Trader_Base TAO_TRADER; /** @@ -77,11 +76,9 @@ public: static TAO_TRADER* create_trader (int& argc, ACE_TCHAR** argv); protected: - TAO_Trader_Factory (int& argc, ACE_TCHAR** argv); private: - enum Conformance { TAO_TRADER_QUERY, TAO_TRADER_SIMPLE, TAO_TRADER_STANDALONE, @@ -125,9 +122,9 @@ private: class TAO_Trading_Serv_Export TAO_Lockable { public: - virtual ~TAO_Lockable (void); + virtual ~TAO_Lockable (); - virtual ACE_Lock& lock (void) = 0; + virtual ACE_Lock& lock () = 0; }; @@ -162,7 +159,6 @@ public: CosTradingRepos::ServiceTypeRepository_ptr service_type_repos () const; private: - /// A reference to the trader (needed for obtaining the lock.) TAO_Lockable &locker_; @@ -203,7 +199,6 @@ public: void max_link_follow_policy (CosTrading::FollowOption); private: - /// A reference to the trader (needed for obtaining the lock.) TAO_Lockable &locker_; @@ -224,7 +219,7 @@ class TAO_Trading_Serv_Export TAO_Import_Attributes_i { public: TAO_Import_Attributes_i (TAO_Lockable &locker); - ~TAO_Import_Attributes_i (void); + ~TAO_Import_Attributes_i (); // = Accessor methods. @@ -262,7 +257,6 @@ public: void max_follow_policy (CosTrading::FollowOption); private: - TAO_Lockable &locker_; /// Upper bound of offers to be searched if <search_card> @@ -319,7 +313,7 @@ class TAO_Trading_Serv_Export TAO_Trading_Components_i { public: TAO_Trading_Components_i (TAO_Lockable &locker); - ~TAO_Trading_Components_i (void); + ~TAO_Trading_Components_i (); /// Returns an object reference to the Lookup interface of the trader. /// Returns nil if the trader does not support Lookup interface. @@ -357,7 +351,6 @@ public: void admin_if (CosTrading::Admin_ptr); private: - TAO_Lockable &locker_; CosTrading::Lookup_var lookup_; @@ -388,7 +381,6 @@ private: class TAO_Trading_Serv_Export TAO_Trader_Base : public TAO_Lockable { public: - enum Trader_Components { LOOKUP = 0x001, @@ -398,23 +390,23 @@ public: ADMIN = 0x010 }; - virtual ~TAO_Trader_Base (void); + virtual ~TAO_Trader_Base (); // = Accessors for objects that manage trader's configuration. - TAO_Trading_Components_i &trading_components (void); + TAO_Trading_Components_i &trading_components (); const TAO_Trading_Components_i &trading_components () const; - TAO_Import_Attributes_i &import_attributes (void); + TAO_Import_Attributes_i &import_attributes (); const TAO_Import_Attributes_i &import_attributes () const; - TAO_Support_Attributes_i &support_attributes (void); + TAO_Support_Attributes_i &support_attributes (); const TAO_Support_Attributes_i &support_attributes () const; - TAO_Link_Attributes_i &link_attributes (void); + TAO_Link_Attributes_i &link_attributes (); const TAO_Link_Attributes_i &link_attributes () const; @@ -461,15 +453,12 @@ protected: TAO_Link_Attributes_i link_attributes_; protected: - /// Implemented. - TAO_Trader_Base (void); + TAO_Trader_Base (); private: - - /// Unimplemented. - TAO_Trader_Base (const TAO_Trader_Base& TAO_Trader_Base); - TAO_Trader_Base& operator= (const TAO_Trader_Base&); + TAO_Trader_Base (const TAO_Trader_Base& TAO_Trader_Base) = delete; + TAO_Trader_Base& operator= (const TAO_Trader_Base&) = delete; }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index 58c9561ca5f..fc5e9b84792 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -36,7 +36,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator type_struct); /// Desctructor. - virtual ~TAO_Trader_Constraint_Validator (void); + virtual ~TAO_Trader_Constraint_Validator (); }; @@ -51,7 +51,7 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Const private: /// Utility with which to evaluate the properties of an offer, be - /// they dyanmic or static. + /// they dynamic or static. TAO_Property_Evaluator prop_eval_; }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index ed477f7326e..084af6df4fd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -59,7 +59,7 @@ class TAO_Lookup : public: TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); - ~TAO_Lookup (void); + ~TAO_Lookup (); virtual void query (const char *type, @@ -237,9 +237,8 @@ private: CORBA::Boolean seen_request_id (TAO_Policies& policies, const CosTrading::Admin::OctetSeq*& seq); - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Lookup (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) + void operator= (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; + TAO_Lookup (const TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; const unsigned int IDS_SAVED; @@ -470,17 +469,14 @@ public: // END SPEC protected: - void validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, const CosTrading::PropertySeq& properties); - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Register (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) + void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; + TAO_Register (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; private: - TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; }; @@ -597,10 +593,8 @@ public: CosTrading::OfferIdIterator_out); private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Admin (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) + void operator= (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; + TAO_Admin (const TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_; @@ -751,10 +745,8 @@ public: // END SPEC private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Link (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) + void operator= (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; + TAO_Link (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; typedef ACE_Hash_Map_Manager_Ex < @@ -806,9 +798,8 @@ public: CosTrading::OfferIdIterator_ptr &); private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Proxy (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &)) + void operator= (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; + TAO_Proxy (const TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &) = delete; TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 5e0e132f891..187a4e1b0b6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -55,7 +55,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Trader : public TAO_Trader_Base { public: - // The desired combination of interfaces to be passed to the // TAO_Trader constructor. @@ -80,7 +79,6 @@ public: ACE_Lock &lock (void); protected: - typedef TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> TRADER_SELF; Offer_Database offer_database_; @@ -93,9 +91,8 @@ protected: PortableServer::ServantBase* ifs_[5]; private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> &)) + void operator= (const TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> &) = delete; }; // ************************************************************* @@ -107,7 +104,6 @@ class TAO_Trader_Components : public virtual IF { public: - TAO_Trader_Components (const TAO_Trading_Components_i& comps); // = CosTrading::TraderComponents methods. @@ -132,7 +128,6 @@ public: virtual CosTrading::Admin_ptr admin_if (void); private: - const TAO_Trading_Components_i& comps_; }; @@ -140,7 +135,6 @@ template <class IF> class TAO_Support_Attributes : public virtual IF { public: - TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs); // = CosTrading::SupportAttributes methods. @@ -154,7 +148,6 @@ public: virtual CosTrading::TypeRepository_ptr type_repos (void); private: - const TAO_Support_Attributes_i& attrs_; }; @@ -162,7 +155,6 @@ template <class IF> class TAO_Import_Attributes : public virtual IF { public: - TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs); // = CosTrading::ImportAttributes methods. @@ -199,9 +191,7 @@ public: virtual CosTrading::FollowOption max_follow_policy (void); - private: - const TAO_Import_Attributes_i& attrs_; }; @@ -209,14 +199,12 @@ template <class IF> class TAO_Link_Attributes : public virtual IF { public: - TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs); // = CosTrading::LinkAttributes methods virtual CosTrading::FollowOption max_link_follow_policy (void); private: - const TAO_Link_Attributes_i& attrs_; }; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index add6daf0604..b5efbed8b0e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -53,7 +53,7 @@ public: CORBA::Boolean supports_dp = 1); /// Clean up dynamic properties. - virtual ~TAO_Property_Evaluator (void); + virtual ~TAO_Property_Evaluator (); /// Returns 1 if the property at index @a index is dynamic. Returns a /// 0 when the index is out of bounds. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 6c2fb4ef839..a8f06ab62e0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -28,8 +28,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" - - TAO_Trading_Loader::TAO_Trading_Loader () : federate_ (0), ior_output_file_ (0), @@ -74,11 +72,6 @@ TAO_Trading_Loader::TAO_Trading_Loader () } } -TAO_Trading_Loader::~TAO_Trading_Loader () -{ - // Destructor -} - int TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index a3a5c9c7ca1..e4c1b22a08b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -33,10 +33,10 @@ class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader { public: /// Constructor - TAO_Trading_Loader (void); + TAO_Trading_Loader (); /// Destructor - ~TAO_Trading_Loader (void); + ~TAO_Trading_Loader () = default; /// Called by the Service Configurator framework to initialize the /// Event Service. Defined in <ace/Service_Config.h> @@ -47,7 +47,7 @@ public: virtual int fini (); /// Run the Trading Service - int run (void); + int run (); /// This function call initializes the Trading Service given a reference to the /// ORB and the command line parameters. @@ -58,10 +58,10 @@ public: protected: /// Enable the Trading Service to answer multicast requests for its /// IOR. - int init_multicast_server (void); + int init_multicast_server (); /// Bootstrap to another trader, and attach to its trader network. - int bootstrap_to_federation (void); + int bootstrap_to_federation (); /// Parses the command line arguments int parse_args (int &argc, ACE_TCHAR *argv []); @@ -91,7 +91,7 @@ protected: /// requests. TAO_IOR_Multicast ior_multicast_; - /// Flag inidicating whether we're the trader others are bootstrapping to. + /// Flag indicating whether we're the trader others are bootstrapping to. CORBA::Boolean bootstrapper_; private: diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index 6951cad21dd..47622cda295 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -1,7 +1,7 @@ // ======================================================================== // // = FILE -// Simple_Dyanmic.h +// Simple_Dynamic.h // // = DESCRIPTION // Class that implements a really simple dynamic property. @@ -25,7 +25,6 @@ template<class T> class TAO_Simple_Dynamic_Property : public TAO_Dynamic_Property { public: - TAO_Simple_Dynamic_Property (const T& dp); virtual CORBA::Any* evalDP (const char* /* name */, diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index df2c5ca5080..31ad3d13eaa 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -120,10 +120,9 @@ public: static CORBA::Object * upcast (void *); private: - /// Unimplemented - prevents widening assignment. TAO_Network_Priority_Mapping_Manager_ptr ptr_; - TAO_Network_Priority_Mapping_Manager_var (const TAO_Base_var &rhs); - TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Base_var &rhs); + TAO_Network_Priority_Mapping_Manager_var (const TAO_Base_var &rhs) = delete; + TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Base_var &rhs) = delete; }; class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_out diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index a2dd7b48886..5ce01aa483c 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -112,10 +112,9 @@ public: static CORBA::Object * upcast (void *); private: - /// Unimplemented - prevents widening assignment. TAO_Priority_Mapping_Manager_ptr ptr_; - TAO_Priority_Mapping_Manager_var (const TAO_Base_var &rhs); - TAO_Priority_Mapping_Manager_var &operator= (const TAO_Base_var &rhs); + TAO_Priority_Mapping_Manager_var (const TAO_Base_var &rhs) = delete; + TAO_Priority_Mapping_Manager_var &operator= (const TAO_Base_var &rhs) = delete; }; class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_out |