Modernize the interceptors a little bit

    * TAO/tests/Portable_Interceptors/Dynamic/README:
    * TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp:
    * TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h:
    * TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp:
    * TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h:

5 files changed, 20 insertions, 41 deletions

diff --git a/TAO/tests/Portable_Interceptors/Dynamic/README b/TAO/tests/Portable_Interceptors/Dynamic/README
index 6f494bcdf76..a2e686c1941 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/README
+++ b/TAO/tests/Portable_Interceptors/Dynamic/README
@@ -1,5 +1,3 @@
-
-
 This test allows you to visually check the correct invocation of
 TAO's pseudo-portable interceptors, especially the Dynamic interface.
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 5bbf202c920..6303dfd820d 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -13,10 +13,6 @@ Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor ()
 {
 }
 
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
-{
-}
-
 char *
 Echo_Client_Request_Interceptor::name ()
 {
@@ -227,7 +223,6 @@ void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-
   CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
@@ -235,7 +230,6 @@ Echo_Client_Request_Interceptor::receive_exception (
               "from \"%C\"\n",
               op.in ()));
 
-
   CORBA::String_var exception_id =
     ri->received_exception_id ();
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index 5e340799c91..e9957b142f0 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -15,40 +15,35 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+/// Client-side echo interceptor.  For checking interceptor visually only.
 class Echo_Client_Request_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
     public virtual ::CORBA::LocalObject
 {
-  // = Client-side echo interceptor.  For checking interceptor visually only.
 public:
+  Echo_Client_Request_Interceptor ();
 
-  Echo_Client_Request_Interceptor (void);
-  // ctor.
-
-  virtual char * name (void);
   // Canonical name of the interceptor.
+  char * name () override;
 
-  virtual void destroy (void);
+  void destroy () override;
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
+  void send_poll (PortableInterceptor::ClientRequestInfo_ptr) override;
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
+  void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) override;
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr);
+  void receive_other (PortableInterceptor::ClientRequestInfo_ptr) override;
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
+  void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) override;
 
-  virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri);
+  void receive_exception (
+      PortableInterceptor::ClientRequestInfo_ptr ri) override;
 
 protected:
-
-  virtual ~Echo_Client_Request_Interceptor (void);
-  // dtor.
+  ~Echo_Client_Request_Interceptor () override = default;
 
 private:
   const char *myname_;
-
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index a9a2e6fca1d..6f423385865 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -13,10 +13,6 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor ()
 {
 }
 
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
-{
-}
-
 char *
 Echo_Server_Request_Interceptor::name ()
 {
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index da47f879f3a..1a83f384679 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -21,32 +21,28 @@ class Echo_Server_Request_Interceptor
 {
   // = Server-side echo interceptor.  For checking interceptor visually only.
 public:
-  Echo_Server_Request_Interceptor (void);
-  // cotr.
+  Echo_Server_Request_Interceptor ();
 
-  virtual char * name (void);
+  char * name () override;
   // Canonical name of the interceptor.
 
-  virtual void destroy (void);
+  void destroy () override;
 
-  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
+  void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) override;
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
+  void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) override;
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
+  void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) override;
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
+  void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) override;
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr);
+  void send_other (PortableInterceptor::ServerRequestInfo_ptr) override;
 
 protected:
-
-  virtual ~Echo_Server_Request_Interceptor (void);
-  // dotr.
+  ~Echo_Server_Request_Interceptor () override = default;
 
 private:
   const char *myname_;
-
 };
 
 #if defined(_MSC_VER)