Make use of delete

    * ACE/performance-tests/TCP/tcp_test.cpp:
    * ACE/performance-tests/UDP/udp_test.cpp:
    * ACE/tests/Token_Strategy_Test.cpp:
    * TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h:

4 files changed, 14 insertions, 14 deletions

diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp
index 8fcded26040..ce04311b7e4 100644
--- a/ACE/performance-tests/TCP/tcp_test.cpp
+++ b/ACE/performance-tests/TCP/tcp_test.cpp
@@ -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/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)