From 6f23f063d837def2f10d284c8f21c12dd077bbf7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 15 Apr 2019 21:07:34 +0200 Subject: Layout, unicode, and doxygen changes * TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp: * TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp: * TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h: --- .../tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp | 6 ++---- .../tests/ImplRepo/ping_interrupt/server_interceptor.cpp | 3 +-- .../tests/ImplRepo/ping_interrupt/server_interceptor.h | 11 +++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp index b1693cd7f78..337c130d38f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp @@ -10,14 +10,12 @@ Server_ORBInitializer::Server_ORBInitializer (int *counter) } void -Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr) +Server_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } void -Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info) +Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { if (this->intr_ != 0) { diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp index d884c5953d2..8c8247294ea 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp @@ -57,7 +57,7 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( } catch (const CORBA::Exception &ex) { - ACE_DEBUG ((LM_DEBUG, "(%P) deactivate raised %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P) deactivate raised %C\n", ex._name())); } throw ::CORBA::TRANSIENT @@ -66,7 +66,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( } - void Ping_Death_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h index 8c2a9bdc62a..913e58f89c1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h @@ -17,28 +17,27 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Server-side echo interceptor. For checking interceptor visually only. class Ping_Death_Request_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Server-side echo interceptor. For checking interceptor visually only. public: - Ping_Death_Request_Interceptor (int *counter); // cotr. + Ping_Death_Request_Interceptor (int *counter); - ~Ping_Death_Request_Interceptor (); // dotr. + ~Ping_Death_Request_Interceptor (); void set_poa (PortableServer::POA_ptr poa); - virtual char * name (void); // Canonical name of the interceptor. + virtual char * name (void); virtual void destroy (void); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr); + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); -- cgit v1.2.1