diff options
Diffstat (limited to 'TAO/tests')
47 files changed, 117 insertions, 68 deletions
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index 8080a408b87..f91911e61c2 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -5,8 +5,8 @@ ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$") class Multiple_Inheritance_i : public POA_D -{ -public: +{ +public: virtual CORBA::String method1 (CORBA::Environment &) { return CORBA::string_dup ("method1"); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index 0a2300f6110..d9b643a66ef 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -10,7 +10,7 @@ // MT_Object_A_i.h // // = DESCRIPTION -// This class implements the Object A of the +// This class implements the Object A of the // Nested Upcalls - MT Client test // // = AUTHORS @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (MT_OBJECT_IMPL_H) +#ifndef MT_OBJECT_IMPL_H # define MT_OBJECT_IMPL_H #include "MT_Client_TestS.h" diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h index b46b41f6d79..b0ddfdec286 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h @@ -17,10 +17,15 @@ // // ============================================================================ -#if !defined (MT_CLIENT_H) +#ifndef MT_CLIENT_H #define MT_CLIENT_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Task.h" #include "ace/Thread_Manager.h" #include "tao/corba.h" @@ -43,9 +48,9 @@ public: int run (void); // Execute client example code. - int init (int argc, + int init (int argc, char **argv, - int client_number); + int client_number); // Initialize the client communication endpoint with server. private: diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index 84bfc68d5fa..47448a588a0 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -10,7 +10,7 @@ // local_server.h // // = DESCRIPTION -// This class implements a simple server for the +// This class implements a simple server for the // Nested Upcalls - MT Client test // // = AUTHORS @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (MT_CLIENT_TEST_MT_SERVER_H) +#ifndef MT_CLIENT_TEST_MT_SERVER_H #define MT_CLIENT_TEST_MT_SERVER_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Log_Msg.h" #include "tao/TAO.h" #include "MT_Object_i.h" @@ -70,7 +75,7 @@ private: // The ORB manager MT_Object_i mT_Object_i_; - // Implementation object + // Implementation object MT_Object_var mT_Object_var_; // reference for the distant MT Object @@ -95,7 +100,7 @@ class MT_Server_Task : public ACE_Task<ACE_SYNCH> // No big purpose, just wrapping public: MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr, - int argc, + int argc, char **argv, TAO_ORB_Manager* orb_manager_ptr); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index cb58c0d6376..b744c1b78c3 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -10,7 +10,7 @@ // server_A.h // // = DESCRIPTION -// This class implements a simple server for the +// This class implements a simple server for the // Nested Upcalls - MT Client test // // = AUTHORS @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (MT_CLIENT_TEST_MT_OBJECT_SERVER_H) +#ifndef MT_CLIENT_TEST_MT_OBJECT_SERVER_H #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Log_Msg.h" #include "tao/TAO.h" #include "MT_Object_i.h" diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h index 73c3195c4fe..8198739eff4 100644 --- a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h +++ b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h @@ -13,7 +13,7 @@ // // ============================================================================ -#if !defined (_NESTEDUPCALLS_I_H) +#ifndef _NESTEDUPCALLS_I_H #define _NESTEDUPCALLS_I_H //#include "cubitS.h" diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h index 706a4d9105a..5e2f2fbc187 100644 --- a/TAO/tests/NestedUpcall/Reactor/client.h +++ b/TAO/tests/NestedUpcall/Reactor/client.h @@ -18,6 +18,11 @@ // ============================================================================ #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "tao/corba.h" #include "reactor_i.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h index c8443da0bcb..c3b0a729696 100644 --- a/TAO/tests/NestedUpcall/Reactor/eh_i.h +++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h @@ -1,7 +1,7 @@ // -*- c++ -*- // $Id$ -#if !defined (EVENTHANDLER_I_H) +#ifndef EVENTHANDLER_I_H # define EVENTHANDLER_I_H #include "ReactorS.h" diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h index 3d4ede734c9..bc7b11c391a 100644 --- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h +++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h @@ -1,7 +1,7 @@ // -*- c++ -*- // $Id$ -#if !defined (REACTOR_I_H) +#ifndef REACTOR_I_H # define REACTOR_I_H #include "ReactorS.h" diff --git a/TAO/tests/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h index cb02f84b701..73acff90fcf 100644 --- a/TAO/tests/NestedUpcall/Reactor/server.h +++ b/TAO/tests/NestedUpcall/Reactor/server.h @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (_NUC_SERVER_H) +#ifndef _NUC_SERVER_H #define _NUC_SERVER_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Log_Msg.h" #include "tao/TAO.h" #include "orbsvcs/CosNamingC.h" diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index d96de135ef8..197b491070f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -10,7 +10,7 @@ // Initiator_i.h // // = DESCRIPTION -// This class implements the Initiator of the +// This class implements the Initiator of the // Nested Upcalls - Triangle test. // // = AUTHORS @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (INITIATOR_IMPL_H) +#ifndef INITIATOR_IMPL_H # define INITIATOR_IMPL_H #include "Triangle_TestS.h" @@ -28,7 +28,7 @@ class Initiator_i : public POA_Initiator // = TITLE // Implement the <Initiator> IDL interface. public: - Initiator_i (Object_A_ptr object_A_ptr, + Initiator_i (Object_A_ptr object_A_ptr, Object_B_ptr object_B_ptr); // Constructor. diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index a1da7af1796..3f41df62c63 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -10,7 +10,7 @@ // Object_A_i.h // // = DESCRIPTION -// This class implements the Object A of the +// This class implements the Object A of the // Nested Upcalls - Triangle test. // // = AUTHORS @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (OBJECT_B_IMPL_H) +#ifndef OBJECT_B_IMPL_H # define OBJECT_B_IMPL_H #include "Triangle_TestS.h" diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index 0757357d510..01366ff476e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -10,7 +10,7 @@ // Object_B_i.h // // = DESCRIPTION -// This class implements the Object B of the +// This class implements the Object B of the // Nested Upcalls - Triangle test. // // = AUTHORS @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (OBJECT_B_IMPL_H) +#ifndef OBJECT_B_IMPL_H # define OBJECT_B_IMPL_H #include "Triangle_TestS.h" diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index 628889f8254..89c9d5e4ccc 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -10,7 +10,7 @@ // initiator.h // // = DESCRIPTION -// This class implements a simple server for the +// This class implements a simple server for the // Nested Upcalls - Triangle test // // = AUTHORS @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (_TRIANGLE_TEST_INITITATOR_SERVER_H) +#ifndef _TRIANGLE_TEST_INITITATOR_SERVER_H #define _TRIANGLE_TEST_INITITATOR_SERVER_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Log_Msg.h" #include "tao/TAO.h" #include "Initiator_i.h" diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index 070bf80d0f9..b15a1618a1f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -10,7 +10,7 @@ // server_A.h // // = DESCRIPTION -// This class implements a simple server for the +// This class implements a simple server for the // Nested Upcalls - Triangle test // // = AUTHORS @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (_TRIANGLE_TEST_OBJECT_A_SERVER_H) +#ifndef _TRIANGLE_TEST_OBJECT_A_SERVER_H #define _TRIANGLE_TEST_OBJECT_A_SERVER_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Log_Msg.h" #include "tao/TAO.h" #include "Object_A_i.h" diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 51028a046e2..9e5356842d6 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -10,7 +10,7 @@ // server_B.h // // = DESCRIPTION -// This class implements a simple server for the +// This class implements a simple server for the // Nested Upcalls - Triangle test // // = AUTHORS @@ -18,10 +18,15 @@ // // ============================================================================ -#if !defined (_TRIANGLE_TEST_OBJECT_B_SERVER_H) +#ifndef _TRIANGLE_TEST_OBJECT_B_SERVER_H #define _TRIANGLE_TEST_OBJECT_B_SERVER_H #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Log_Msg.h" #include "tao/TAO.h" #include "Object_B_i.h" diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index 62681bd5041..a696b661dd3 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_ANY_H) +#ifndef PARAM_TEST_ANY_H #define PARAM_TEST_ANY_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index f22ae99df0c..4262819fe33 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_BOUNDED_LONG_SEQUENCE_H) +#ifndef PARAM_TEST_BOUNDED_LONG_SEQUENCE_H #define PARAM_TEST_BOUNDED_LONG_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index cb2257e2810..777436d236f 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H) +#ifndef PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H #define PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index 23f97b76538..a444ddfbd39 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_BOUNDED_STRING_SEQUENCE_H) +#ifndef PARAM_TEST_BOUNDED_STRING_SEQUENCE_H #define PARAM_TEST_BOUNDED_STRING_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index 16a9098789c..9efa9c7c956 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_BOUNDED_STRING_H) +#ifndef PARAM_TEST_BOUNDED_STRING_H #define PARAM_TEST_BOUNDED_STRING_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index ada88f76732..dd4c0575d53 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H) +#ifndef PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H #define PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h index 9321f3ae53f..adab6ad81fc 100644 --- a/TAO/tests/Param_Test/client.h +++ b/TAO/tests/Param_Test/client.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_CLIENT_H) +#ifndef PARAM_TEST_CLIENT_H #define PARAM_TEST_CLIENT_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h index 0b035be7f87..a39aedc41d7 100644 --- a/TAO/tests/Param_Test/driver.h +++ b/TAO/tests/Param_Test/driver.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if !defined (DRIVER_H) +#ifndef DRIVER_H #define DRIVER_H #include "options.h" diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h index 6f3e7bc9ef0..5f08f531182 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_EXCEPTION_H) +#ifndef PARAM_TEST_EXCEPTION_H #define PARAM_TEST_EXCEPTION_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index 66b093b8180..a54a0d41768 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_FIXED_ARRAY_H) +#ifndef PARAM_TEST_FIXED_ARRAY_H #define PARAM_TEST_FIXED_ARRAY_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index c9d62df4a64..b997a672ea6 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_FIXED_STRUCT_H) +#ifndef PARAM_TEST_FIXED_STRUCT_H #define PARAM_TEST_FIXED_STRUCT_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h index e76394ba6e1..fb128fbfb2d 100644 --- a/TAO/tests/Param_Test/helper.h +++ b/TAO/tests/Param_Test/helper.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if !defined (HELPER_H) +#ifndef HELPER_H #define HELPER_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index 90843c0aa57..68cdfba74fb 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_NESTED_STRUCT_H) +#ifndef PARAM_TEST_NESTED_STRUCT_H #define PARAM_TEST_NESTED_STRUCT_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index 18b8e40a211..faa6e27c15b 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -9,14 +9,14 @@ // objref.h // // = DESCRIPTION -// Tests object references +// Tests object references // // = AUTHORS // Aniruddha Gokhale // // ============================================================================ -#if !defined (PARAM_TEST_OBJREF_H) +#ifndef PARAM_TEST_OBJREF_H #define PARAM_TEST_OBJREF_H #include "param_testCli.h" @@ -79,7 +79,7 @@ private: // Need these for DII. // SII requests that involve aliased objref types can rely on - // their stubs and skeletons to convert to CORBA::Object so the + // their stubs and skeletons to convert to CORBA::Object so the // ORB can deal with it. DII requests cannot convert for every // possible aliased objref type, so we must convert ourselves // before invoking the DII request, and use the interface's diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h index 20e6283deed..71d1de317c3 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_OBJREF_STRUCT_H) +#ifndef PARAM_TEST_OBJREF_STRUCT_H #define PARAM_TEST_OBJREF_STRUCT_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h index e3898028d33..d477450aa8a 100644 --- a/TAO/tests/Param_Test/options.h +++ b/TAO/tests/Param_Test/options.h @@ -17,10 +17,15 @@ // // ============================================================================ -#if !defined (OPTIONS_H) +#ifndef OPTIONS_H #define OPTIONS_H #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "tao/corba.h" class Options diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 806018ca5c7..2ec44acf398 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -13,7 +13,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_I_H) +#ifndef PARAM_TEST_I_H #define PARAM_TEST_I_H #include "param_testSer.h" @@ -224,9 +224,9 @@ public: // test for arrays of variable types virtual CORBA::ULong test_exception (CORBA::ULong s1, - CORBA::ULong& s2, - CORBA::ULong_out s3, - CORBA::Environment &env); + CORBA::ULong& s2, + CORBA::ULong_out s3, + CORBA::Environment &env); void shutdown (CORBA::Environment &env); diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h index e4ed1320818..5f8139f655b 100644 --- a/TAO/tests/Param_Test/results.h +++ b/TAO/tests/Param_Test/results.h @@ -16,12 +16,16 @@ // // ============================================================================ -#if !defined (RESULTS_H) +#ifndef RESULTS_H #define RESULTS_H #include "tao/corba.h" #include "ace/Profile_Timer.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class Results { public: diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index f6b96562d88..c2ed72e7143 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_SHORT_H) +#ifndef PARAM_TEST_SHORT_H #define PARAM_TEST_SHORT_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/tests.h b/TAO/tests/Param_Test/tests.h index 146c5228d30..f1845ebd497 100644 --- a/TAO/tests/Param_Test/tests.h +++ b/TAO/tests/Param_Test/tests.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (TESTS_H) +#ifndef TESTS_H #define TESTS_H #include "any.h" diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index 06d667e9afe..5c8896e6551 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_TYPECODE_H) +#ifndef PARAM_TEST_TYPECODE_H #define PARAM_TEST_TYPECODE_H #include "param_testCli.h" @@ -65,7 +65,7 @@ private: CORBA::TypeCode_var tc_holder_; // place for selected typecode to stay during time // between init_parameters () and reset_parameters (). - + char *opname_; // operation name diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index c13681b6ee9..9c3ebeba014 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H) +#ifndef PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index ed0244b9459..d106e8e1bb1 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H) +#ifndef PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index d6ea252182b..e1395f0ffae 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H) +#ifndef PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H #include "param_testCli.h" @@ -65,7 +65,7 @@ public: protected: CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1, const Param_Test::Coffee_Mix &s2, - CORBA::Environment& env); + CORBA::Environment& env); // compare void print_sequence (const Param_Test::Coffee_Mix &s); diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index eb480025031..7c6c276b30d 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H) +#ifndef PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 7ee69db9964..6b081ffd069 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H) +#ifndef PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index 678a0a10e24..82de5ff5103 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNDED_STRING_H) +#ifndef PARAM_TEST_UNBOUNDED_STRING_H #define PARAM_TEST_UNBOUNDED_STRING_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 0baf2d16787..3889561dab2 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H) +#ifndef PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H #define PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index 0b281c158ba..3b898b08639 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_ULONGLONG_H) +#ifndef PARAM_TEST_ULONGLONG_H #define PARAM_TEST_ULONGLONG_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index 996f091c595..96737fd2080 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_VAR_ARRAY_H) +#ifndef PARAM_TEST_VAR_ARRAY_H #define PARAM_TEST_VAR_ARRAY_H #include "param_testCli.h" diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index 288fc0fa9eb..9ab1af5a7bd 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (PARAM_TEST_VAR_STRUCT_H) +#ifndef PARAM_TEST_VAR_STRUCT_H #define PARAM_TEST_VAR_STRUCT_H #include "param_testCli.h" |