diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 12:07:41 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 12:07:41 +0100 |
commit | 396f0d4b04a3d4c89c009013ca20cf4d4e5e32f7 (patch) | |
tree | 0287e92263c0ff62090389a3af14f20a9027e168 | |
parent | 895191139d5565425fdab280e5f459f610e5230c (diff) | |
download | ATCD-396f0d4b04a3d4c89c009013ca20cf4d4e5e32f7.tar.gz |
Layout changes and fixed unicode logging issue
* TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp:
* TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h:
* TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h:
* TAO/tests/Portable_Interceptors/Dynamic/client.cpp:
* TAO/tests/Portable_Interceptors/Dynamic/server.cpp:
5 files changed, 3 insertions, 9 deletions
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 2af09d07db9..709afbce4a5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -28,7 +28,6 @@ Echo_Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index 84cdaa3c472..0cb32f35ee9 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -27,7 +27,6 @@ class Echo_Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index d2c2e6de155..df9a27cff39 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -27,7 +27,6 @@ class Echo_Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c0153f9e365..3c0f7f4e3e5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -38,12 +38,10 @@ run_test (Test_Interceptors::Visual_ptr server) { CORBA::String_var msg; - server->normal (10, - msg.out ()); + server->normal (10, msg.out ()); CORBA::Long one = 1, two = 1, result = 0; - result = server->calculate (one, - two); + result = server->calculate (one, two); ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 6ca15eecd4b..824a5773e98 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "Echo_Server_ORBInitializer.h" #include "ace/OS_NS_stdio.h" - #include "tao/ORBInitializer_Registry.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -86,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::String_var ior = orb->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) |