From 7832cbc2b97d64de5e386b7c3b59022ee3797b8a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 16 Apr 2019 10:18:54 +0200 Subject: Layout and unicode fixes * TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp: * TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp: * TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp: * TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h: --- TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp | 2 -- TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp | 3 +-- TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp | 16 ++++------------ TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h | 12 ++---------- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp index df6ec85f5a2..14661239937 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp @@ -123,5 +123,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; } - - diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp index d5776eec110..9f338efb08c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp @@ -93,8 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableServer::POA_var poa_a = rootPOA->create_POA ("poaB", poa_manager.in (), - policies - ); + policies); for (CORBA::ULong i = 0; i < policies.length (); diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp index 8d781e5a64d..6a76a9bc053 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp @@ -1,7 +1,6 @@ #include "test_i.h" #include "ace/OS_NS_time.h" - // Implementation skeleton constructor Test_Dummy_i::Test_Dummy_i (void) { @@ -12,9 +11,7 @@ Test_Dummy_i::~Test_Dummy_i (void) { } -char * Test_Dummy_i::getMessage ( - void - ) +char * Test_Dummy_i::getMessage (void) { // Add your implementation here return CORBA::string_dup("Test::Dummy---->Hello World"); @@ -29,22 +26,17 @@ Test_Time_i::~Test_Time_i (void) { } -::CORBA::Long Test_Time_i::current_time ( - void - ) +::CORBA::Long Test_Time_i::current_time (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n")); return CORBA::Long (ACE_OS::time (0)); } -void Test_Time_i::shutdown ( - void - ) +void Test_Time_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, - "%s\n", + "%C\n", "Time_i is shutting down")); - } diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h index ff679e82b06..536c7fe81a8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h @@ -7,7 +7,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - class Test_Dummy_i : public virtual POA_taoimrtest::reconnectserver::Dummy { @@ -31,17 +30,10 @@ public: // Destructor virtual ~Test_Time_i (void); - virtual - ::CORBA::Long current_time ( - void - ); + virtual ::CORBA::Long current_time (void); - virtual - void shutdown ( - void - ); + virtual void shutdown (void); }; - #endif /* IMR_RECONNECTSERVER_H */ -- cgit v1.2.1