diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-07-04 05:19:15 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-07-04 05:19:15 +0000 |
| commit | ebf5a47d5b743617b6331868db3cdc132af6f845 (patch) | |
| tree | d377bde30d768bd1713e278a524426dd18f07bcd /TAO | |
| parent | 033524440e21243fe1836a99c3253c3febbff7cd (diff) | |
| download | ATCD-ebf5a47d5b743617b6331868db3cdc132af6f845.tar.gz | |
Wed Jul 4 04:18:48 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'TAO')
148 files changed, 333 insertions, 178 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 10045ed9f24..31a11fbbde4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,158 @@ +Wed Jul 4 04:18:48 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp: + * orbsvcs/tests/Bug_1395_Regression/client.cpp: + * orbsvcs/tests/Bug_1395_Regression/server.cpp: + * orbsvcs/tests/Bug_2137_Regression/client.cpp: + * orbsvcs/tests/Bug_2247_Regression/server.cpp: + * orbsvcs/tests/Bug_2248_Regression/server.cpp: + * orbsvcs/tests/Bug_2285_Regression/client.cpp: + * orbsvcs/tests/Bug_2285_Regression/client2.cpp: + * orbsvcs/tests/Bug_2285_Regression/server.cpp: + * orbsvcs/tests/Bug_2285_Regression/server2.cpp: + * orbsvcs/tests/Bug_2287_Regression/client.cpp: + * orbsvcs/tests/Bug_2287_Regression/server.cpp: + * orbsvcs/tests/Bug_2316_Regression/client.cpp: + * orbsvcs/tests/Bug_2316_Regression/server.cpp: + * orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp: + * orbsvcs/tests/Bug_2615_Regression/client.cpp: + * orbsvcs/tests/Bug_2615_Regression/server.cpp: + * orbsvcs/tests/Bug_2709_Regression/client.cpp: + * orbsvcs/tests/Bug_2709_Regression/server.cpp: + * orbsvcs/tests/Bug_2800_Regression/client.cpp: + * orbsvcs/tests/Bug_2925_Regression/client.cpp: + * orbsvcs/tests/Bug_2925_Regression/server.cpp: + * orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp: + * orbsvcs/tests/Concurrency/CC_client.cpp: + * orbsvcs/tests/CosEvent/Basic/Disconnect.cpp: + * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp: + * orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp: + * orbsvcs/tests/CosEvent/Basic/Push_Event.cpp: + * orbsvcs/tests/CosEvent/Basic/Random.cpp: + * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp: + * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp: + * orbsvcs/tests/EC_MT_Mcast/MCast.cpp: + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: + * orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp: + * orbsvcs/tests/Event/Basic/BCast.cpp: + * orbsvcs/tests/Event/Basic/Bitmask.cpp: + * orbsvcs/tests/Event/Basic/Complex.cpp: + * orbsvcs/tests/Event/Basic/Control.cpp: + * orbsvcs/tests/Event/Basic/Disconnect.cpp: + * orbsvcs/tests/Event/Basic/Gateway.cpp: + * orbsvcs/tests/Event/Basic/MT_Disconnect.cpp: + * orbsvcs/tests/Event/Basic/Negation.cpp: + * orbsvcs/tests/Event/Basic/Observer.cpp: + * orbsvcs/tests/Event/Basic/Random.cpp: + * orbsvcs/tests/Event/Basic/Reconnect.cpp: + * orbsvcs/tests/Event/Basic/Schedule.cpp: + * orbsvcs/tests/Event/Basic/Shutdown.cpp: + * orbsvcs/tests/Event/Basic/Timeout.cpp: + * orbsvcs/tests/Event/Basic/Wildcard.cpp: + * orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp: + * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp: + * orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp: + * orbsvcs/tests/Event/Mcast/Complex/supplier.cpp: + * orbsvcs/tests/Event/Mcast/Simple/consumer.cpp: + * orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp: + * orbsvcs/tests/Event/Mcast/Simple/supplier.cpp: + * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp: + * orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp: + * orbsvcs/tests/Event/Performance/Connect.cpp: + * orbsvcs/tests/Event/Performance/Inversion.cpp: + * orbsvcs/tests/Event/Performance/Latency.cpp: + * orbsvcs/tests/Event/Performance/Latency_Server.cpp: + * orbsvcs/tests/Event/Performance/Throughput.cpp: + * orbsvcs/tests/Event/ThreadFlags/testflags.cpp: + * orbsvcs/tests/Event/UDP/receiver.cpp: + * orbsvcs/tests/Event/UDP/sender.cpp: + * orbsvcs/tests/FT_App/FT_Client.cpp: + * orbsvcs/tests/FT_App/FT_Creator.cpp: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp: + * orbsvcs/tests/FaultTolerance/IOGR/server.cpp: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp: + * orbsvcs/tests/HTIOP/AMI/client.cpp: + * orbsvcs/tests/HTIOP/AMI/server.cpp: + * orbsvcs/tests/HTIOP/AMI/simple_client.cpp: + * orbsvcs/tests/HTIOP/BiDirectional/client.cpp: + * orbsvcs/tests/HTIOP/BiDirectional/server.cpp: + * orbsvcs/tests/HTIOP/Hello/client.cpp: + * orbsvcs/tests/HTIOP/Hello/server.cpp: + * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp: + * orbsvcs/tests/ImplRepo/airplane_client.cpp: + * orbsvcs/tests/ImplRepo/airplane_server.cpp: + * orbsvcs/tests/ImplRepo/nestea_client.cpp: + * orbsvcs/tests/ImplRepo/nestea_server.cpp: + * orbsvcs/tests/ImplRepo/scale/server.cpp: + * orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp: + * orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp: + * orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp: + * orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp: + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp: + * orbsvcs/tests/Miop/McastHello/client.cpp: + * orbsvcs/tests/Miop/McastHello/server.cpp: + * orbsvcs/tests/Notify/Basic/AdminProperties.cpp: + * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp: + * orbsvcs/tests/Notify/Basic/Events.cpp: + * orbsvcs/tests/Notify/Basic/Filter.cpp: + * orbsvcs/tests/Notify/Basic/LifeCycle.cpp: + * orbsvcs/tests/Notify/Basic/MultiTypes.cpp: + * orbsvcs/tests/Notify/Basic/Sequence.cpp: + * orbsvcs/tests/Notify/Basic/Simple.cpp: + * orbsvcs/tests/Notify/Basic/Updates.cpp: + * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp: + * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp: + * orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp: + * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: + * orbsvcs/tests/Property/client.cpp: + * orbsvcs/tests/Property/main.cpp: + * orbsvcs/tests/Property/server.cpp: + * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp: + * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp: + * orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp: + * orbsvcs/tests/Security/BiDirectional/client.cpp: + * orbsvcs/tests/Security/BiDirectional/server.cpp: + * orbsvcs/tests/Security/Big_Request/client.cpp: + * orbsvcs/tests/Security/Big_Request/server.cpp: + * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp: + * orbsvcs/tests/Security/Bug_1107_Regression/server.cpp: + * orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp: + * orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp: + * orbsvcs/tests/Security/Callback/client.cpp: + * orbsvcs/tests/Security/Callback/server.cpp: + * orbsvcs/tests/Security/Crash_Test/client.cpp: + * orbsvcs/tests/Security/Crash_Test/server.cpp: + * orbsvcs/tests/Security/EndpointPolicy/test.cpp: + * orbsvcs/tests/Security/InsecureReferences/test.cpp: + * orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp: + * orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp: + * orbsvcs/tests/Security/MT_SSLIOP/client.cpp: + * orbsvcs/tests/Security/MT_SSLIOP/server.cpp: + * orbsvcs/tests/Security/Secure_Invocation/client.cpp: + * orbsvcs/tests/Security/Secure_Invocation/server.cpp: + * orbsvcs/tests/Security/ssliop_corbaloc/client.cpp: + * orbsvcs/tests/Simple_Naming/client.cpp: + * orbsvcs/tests/Time/client.cpp: + * orbsvcs/tests/Trading/colocated_test.cpp: + * orbsvcs/tests/Trading/export_test.cpp: + * orbsvcs/tests/Trading/import_test.cpp: + + Fixed fuzz warnings. + Use "int ACE_TMAIN (int argc, ACE_TCHAR *argv[])" + instead of "int main (int argc, char *argv[])" to conform to ACE's + coding guidelines. + Tue Jul 3 18:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * examples/RTScheduling/RTSchedTestLib.mpc diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index ebea42eb1c3..a7261e10e7a 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -40,7 +40,7 @@ Time_impl::Shutdown (void) } int -main(int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp index 62835ad88b3..bf8b16d90b4 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index 6d6e525ff63..4b8a5e07d42 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -32,7 +32,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp index 5f9c0275df2..7fd8f5d6cf5 100644 --- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp @@ -70,7 +70,7 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::Boolean result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index b2763bdcbd1..c0ea1458d12 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp @@ -27,7 +27,7 @@ parse_args (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-o <iorfile>" - "-k <key>" + "-k <key>" "\n", argv [0]), -1); @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 49f14c60cdd..461a18db17a 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -36,8 +36,8 @@ parse_args (int argc, char *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-o <iorfile>" - "-k <key> " - "-f merged_iorstr" + "-k <key> " + "-f merged_iorstr" "\n", argv [0]), -1); @@ -47,7 +47,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp index 52f88f1f19a..b6994793464 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::Boolean result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp index e5bbb615bcf..f63e3e806da 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp @@ -92,7 +92,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_ } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::Boolean result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp index 9b94989ebe8..1d672291ead 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp @@ -92,7 +92,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_ } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp index aa0bd15fa12..7d7adbabe6a 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp index de2f62c533a..d05652ff6bd 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::Boolean result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp index 96fa57a24ce..9397a959907 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp @@ -92,7 +92,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_ } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp index 176a7d7dc14..92b40b866fe 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp @@ -7,7 +7,7 @@ const char *ior_callback = "callback.ior"; const char *ior_server = "file://server.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp index 76443812a25..1c5b78b339e 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp @@ -4,7 +4,7 @@ #include "ace/OS_NS_stdio.h" int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { @@ -13,15 +13,15 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in ()); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); poa_manager->activate (); - + Server_impl* server_obj = new Server_impl(orb.in()); server_var server = server_obj->_this(); CORBA::String_var ior = orb->object_to_string (server.in ()); - + FILE *output_file = ACE_OS::fopen ("server.ior", "w"); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); @@ -33,6 +33,6 @@ main (int argc, char *argv[]) { return 1; } - + return 0; } diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp index 11bd1ef7607..4662b86326b 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp @@ -148,7 +148,7 @@ private: int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { MessageLog logger (HELLO_CALL_NUMBER); diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp index 6a1be109246..c65013b9b88 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::Boolean result = 0; try diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp index b7e9c7b9c81..29356e4fba3 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp @@ -95,7 +95,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_ } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp index 0a5d0e5defb..bb4d611dfaf 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp @@ -50,7 +50,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char * argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int failed = 0; diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp index b0ffadbf641..127b9760716 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp @@ -42,7 +42,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp index cfaedd2ea24..66f6a8bf893 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp @@ -33,7 +33,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp index 48599a22699..48945840eb6 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/client.cpp @@ -164,7 +164,7 @@ private: int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp index 4f01725859b..bdbd71a5ada 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp @@ -53,7 +53,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { MessageLog logger(HELLO_CALL_NUMBER); diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp index b895c972726..89d052de82e 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/COIOP_Test.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) == -1) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 3c6d9560c0c..b13c756d058 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -443,7 +443,7 @@ CC_Client::init (int argc, char **argv) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CC_Client cc_client; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 17bb52a3988..4853c5b86f0 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -15,7 +15,7 @@ static void run_test (PortableServer::POA_ptr poa, int use_callbacks); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index 6a8d0eca3a4..d321d47a740 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -15,7 +15,7 @@ static void run_test (PortableServer::POA_ptr poa, int use_callbacks); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index 7c606142cba..1a73a9003b2 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -11,7 +11,7 @@ ACE_RCSID (CEC_Tests_Basic, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index bd60a437867..7e1783336a1 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -11,7 +11,7 @@ ACE_RCSID (CEC_Tests_Basic, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index c4b1c0400bb..adae71620ac 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -12,7 +12,7 @@ ACE_RCSID (CEC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { RND_Driver driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index b46682495bf..02f0eb83977 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -13,7 +13,7 @@ static void run_test (PortableServer::POA_ptr poa, int with_callbacks); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 13b532c93bd..bdcc001e096 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -23,7 +23,7 @@ ACE_RCSID (EC_Custom_Marshal, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Driver driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 936fdd5195c..21b7db81e83 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -491,7 +491,7 @@ Test_Supplier::consumer_proxy (void) } int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ECMS_Driver driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 826de5e8304..7b7079fe1c9 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -62,7 +62,7 @@ run_orb_within_thread (void *) int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index d9fa497aaf8..99a1a9eae9c 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -1065,7 +1065,7 @@ ECM_Local_Federation::subscribed_bit (int i) const } int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 1538fcf674a..52cfc5b1bbe 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -1483,7 +1483,7 @@ Test_Consumer::disconnect_push_consumer (void) } int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Test_ECG *test; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index f4c813592dc..2131d1302a2 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -21,7 +21,7 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ECT_Consumer_Driver driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index c566141b74c..9d837308fc8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -21,7 +21,7 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ECT_Supplier_Driver driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 55d0377c39e..e5a069b9558 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -26,7 +26,7 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index f5b5e192edb..5b19a57b942 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -18,7 +18,7 @@ const int event_type = 20; const int event_source = 10; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 7749612c581..f10370b8689 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_BCast driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index e974116ed6a..29ab5292c67 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 817ccb741a0..e0297bb91d2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -12,7 +12,7 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index d6af8fe7a5e..fb000c0461d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -18,7 +18,7 @@ const int event_type = 20; const int event_source = 10; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index bfb0f352c59..87a6716299c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -16,7 +16,7 @@ static void run_test (PortableServer::POA_ptr poa, int use_callbacks); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 78388681d77..8f11228326e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index cd169f3f22d..fa4957da024 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -17,7 +17,7 @@ static void run_test (PortableServer::POA_ptr poa, int use_callbacks); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index c9ece50b101..0de338ee369 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index ddbc80dab05..e7d5a1bba3f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); EC_Master master; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index cd8641c38f6..8f6a2f92089 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -14,7 +14,7 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { RND_Driver driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 9bac1970f9c..0548e3240f6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -12,7 +12,7 @@ ACE_RCSID (EC_Tests_Basic, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_Reconnect driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 399a00fe4e7..eee815e21ec 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -14,7 +14,7 @@ ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_Schedule driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index 69353f28f52..d23fda2966e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -7,7 +7,7 @@ ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_Shutdown driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 6333d68d629..21978e810d8 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -15,7 +15,7 @@ ACE_RCSID (EC_Tests, // **************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 7304f459304..366be7854f9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -12,7 +12,7 @@ ACE_RCSID (EC_Tests, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp index 4add558600b..a007bb8a89a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Hello, client, "$Id$") const char *ior = "file://as.ior"; int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index b2d3faef8f6..424342dbe16 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -128,7 +128,7 @@ parse_args (int /* argc */, char ** /* argv */) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp index 7ab5ff9b030..b08cd796de1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp @@ -2,8 +2,8 @@ #include "Gateway_EC.h" -int -main (int argc, char ** argv) +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Gateway_EC test; if (test.run (argc, argv) == -1) diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index 2407f91d5f9..4f1a1db6026 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -50,7 +50,7 @@ parse_args (int /*argc*/, char ** /*argv*/) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 42f4cff3add..13da5f5ea4d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -97,7 +97,7 @@ parse_args (int /* argc */, char ** /* argv */) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp index 462f226b0aa..b011869f364 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp @@ -3,7 +3,7 @@ #include "Gateway_EC.h" int -main (int argc, char ** argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Gateway_EC test; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index fa7076fc438..15f225d8715 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -42,7 +42,7 @@ parse_args (int /*argc*/, char ** /*argv*/) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 7e6e19b4b63..f4314daf2e1 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -568,7 +568,7 @@ parse_args (int argc, char ** argv) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { // We may want this to be alive beyond the next block. TAO_EC_Servant_Var<Heartbeat_Application> app; diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp index c048843d90b..c426e38e928 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp @@ -2,8 +2,8 @@ #include "Gateway_EC.h" -int -main (int argc, char ** argv) +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Gateway_EC test; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 9d49de34f95..ad1b03d9b6e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests_Performance, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_Connect driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index a8a4c1c9eee..32381be3d7e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -13,7 +13,7 @@ ACE_RCSID (EC_Tests_Performance, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_Inversion driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 104af8dffe2..8816a5c9ed2 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -23,7 +23,7 @@ const char *ec_ior = "file://ec.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index d1904cb385c..05d44c0b8cf 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -20,7 +20,7 @@ const char *ior_file_name = "ec.ior"; static int parse_args (int argc, char *argv[]); int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 727f5a22cdd..158b76ce34c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -11,7 +11,7 @@ ACE_RCSID (EC_Tests_Performance, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC_Throughput driver; return driver.run (argc, argv); diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp index 5533980c9f3..db920afaee4 100644 --- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp +++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp @@ -110,7 +110,7 @@ void print_results (int how, ExpectedValues expected, ExpectedValues actuals) { const char* op = - (how == ThreadFlagsTest::INIT) ? "INIT" : + (how == ThreadFlagsTest::INIT) ? "INIT" : (how == ThreadFlagsTest::ASSIGN) ? "ASSIGN" : (how == ThreadFlagsTest::BOTH) ? "BOTH" : "unk?"; @@ -122,11 +122,11 @@ print_results (int how, ExpectedValues expected, ExpectedValues actuals) } int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ThreadFlagsTest static_tests[] = { // Test 1 - ThreadFlagsTest(0, ThreadFlagsTest::BOTH, DEFAULTS, CHECK_ALL), + ThreadFlagsTest(0, ThreadFlagsTest::BOTH, DEFAULTS, CHECK_ALL), // Test 2 ThreadFlagsTest("THR_CANCEL_DISABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_DISABLE), CHECK_ALL), ThreadFlagsTest("THR_CANCEL_ENABLE", ThreadFlagsTest::BOTH, ExpectedValues(THR_CANCEL_ENABLE), CHECK_ALL), @@ -158,7 +158,7 @@ main (int argc, char* argv[]) ExpectedValues(THR_NEW_LWP|THR_SCHED_FIFO|THR_SCOPE_SYSTEM|THR_JOINABLE, THR_SCOPE_SYSTEM, THR_SCHED_FIFO), CHECK_ALL) }; - + int returnval = 0; const size_t numtests = sizeof(static_tests)/sizeof(static_tests[0]); if (argc > 1) @@ -179,10 +179,10 @@ main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "FAILED -- details: ")); if (r & ThreadFlagsTest::INIT) print_results (ThreadFlagsTest::INIT, t.expected_values_, results); - + if (r & ThreadFlagsTest::ASSIGN) print_results (ThreadFlagsTest::ASSIGN, t.expected_values_, results); - + ACE_DEBUG ((LM_DEBUG, "\n")); } else @@ -211,10 +211,10 @@ main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "FAILED -- details: ")); if (r & ThreadFlagsTest::INIT) print_results (ThreadFlagsTest::INIT, t.expected_values_, results); - + if (r & ThreadFlagsTest::ASSIGN) print_results (ThreadFlagsTest::ASSIGN, t.expected_values_, results); - + ACE_DEBUG ((LM_DEBUG, "\n")); } else diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index 392f753848e..ff12b7b91fa 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -25,7 +25,7 @@ bool valuetype = false; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp index a00d089d570..276c56f8c5a 100644 --- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp @@ -24,7 +24,7 @@ bool valuetype = false; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 335b3034549..5fa6d56ef2b 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -600,7 +600,7 @@ int FTClientMain::run (void) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { FTClientMain app; int result = app.parse_args(argc, argv); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 0566e428b96..e95ad86d566 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -246,7 +246,7 @@ int FTAPP::FT_Creator::fini () } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int result = 0; try diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index bab602eb912..98156ebffe4 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int status = 0; diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 082e91dc80f..e3f86094dee 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -146,7 +146,7 @@ void test_colocal (ForwardRequestTest::test_ptr server) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index 9ee4a863c89..6302133a368 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -32,7 +32,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 95d0056e813..48923bcee78 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -26,7 +26,7 @@ ACE_RCSID(IOGRManipluation, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 2d50b5a9de6..9637a29cfb9 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -160,7 +160,7 @@ public: Handler handler; int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_client")); try diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 4ecfd5bb289..77a673f9b6b 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -58,7 +58,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server")); try diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 89fa19c457a..c6822b2a483 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -141,7 +141,7 @@ public: }; int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client")); diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index eb8e375ed24..31bd14965f6 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB::_nil(); PortableServer::POA_var root_poa = PortableServer::POA::_nil(); diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index 1abe27e0b83..b8bb53b3304 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index 91fd2361500..e166b4cec3d 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Hello_client")); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 53379830481..3434cf37f3d 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Hello_server")); diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp index 41195ba4376..568cfe4c3ef 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp @@ -40,7 +40,7 @@ writeIORFile (const char* ior) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { @@ -74,7 +74,7 @@ main (int argc, char *argv[]) orb->run (); // the following 1 second of sleep is needed to help - // Windows with "server shutdown too quickly so the + // Windows with "server shutdown too quickly so the // client cannot get the reply" issue. ACE_OS::sleep(1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Messenger server shutting " diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp index 1bee519f70d..7bfd7b75f2f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp @@ -4,14 +4,14 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ImplRepo, - airplane_client, +ACE_RCSID (ImplRepo, + airplane_client, "$Id$") // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Airplane_Client_i client; diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp index 5c3ab7d7763..55b71a4297e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp @@ -7,7 +7,7 @@ ACE_RCSID (ImplRepo, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Airplane_Server_i server; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp index 60d05c63a82..2951b0b1106 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp @@ -4,14 +4,14 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ImplRepo, - nestea_client, +ACE_RCSID (ImplRepo, + nestea_client, "$Id$") // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Nestea_Client_i client; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index 65735e280f7..1177d965430 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -5,7 +5,7 @@ ACE_RCSID(ImplRepo, nestea_server, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Nestea_Server_i server; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp index feb6d972b2e..a765c5c1ae2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp @@ -3,7 +3,7 @@ #include "server_i.h" int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index 18febaffa5f..e50a8aa33f6 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Application_Test, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { IFR_DII_Client client; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index a9ac55839ef..ec74ced335c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -39,7 +39,7 @@ write_ior_to_file (const char *ior) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp index 3397a80f770..f43536c1139 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Application_Test, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { IDL3_Client client; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 43c9155ebb1..3561ace0f15 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -3,16 +3,16 @@ #include "Latency_Query_Client.h" -ACE_RCSID (Latency__Test, - client, +ACE_RCSID (Latency__Test, + client, "$Id$") -int -main (int argc, char *argv[]) +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Latency_Query_Client client; - int retval = client.init (argc, + int retval = client.init (argc, argv); if (retval == -1) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp index 501cb30955c..843f72beaf4 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 426e83d82b1..58d813c0349 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID (Application_Controlled, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index b3f48542c0d..3fc36df9dd7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -36,7 +36,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp index 735da982dc4..844e2ebe789 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID (Infrastructure_Controlled, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { const char *location1 = "MyLocation 1"; const char *location2 = "MyLocation 2"; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index 942f5f24287..4b984f94960 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID (Manage_object_group, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index b82cd08bf98..fd5c6e9ce6b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -61,7 +61,7 @@ check_loads (const CosLoadBalancing::LoadList & loads) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index aa9ca41f651..ddcf34c7a19 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index e5a0086e3ca..8fba7d0928d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -50,7 +50,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index 0978675ce82..d582c0052d3 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -436,7 +436,7 @@ AdminProperties::create_consumers (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { AdminProperties test; diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index dd508e4b43a..365673a6870 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -305,7 +305,7 @@ ConnectDisconnect::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ConnectDisconnect client; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index c46dbbecaac..439ee179537 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -289,7 +289,7 @@ Events::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Events events; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index cb5ac5e0900..0988e9304c4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -187,7 +187,7 @@ Filter::create_EC (void) //*************************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Filter events; diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 2d43e10c4d0..a69893209a9 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -217,7 +217,7 @@ LifeCycle::destroy_ec (void) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index d5177fa07b7..91ff3bbbac1 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -330,7 +330,7 @@ MultiTypes::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { MultiTypes client; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index a042fa95fad..38a21fa2230 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -325,7 +325,7 @@ Sequence::check_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Sequence events; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index 59801244fb6..5b9682bbb34 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -207,7 +207,7 @@ Simple_Test::check_results (void) //*************************************************************************** int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Simple_Test events; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 293f27e2899..99aa0315a7c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -423,7 +423,7 @@ Updates::test_offer_change (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Updates updates; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 184c9b546fb..1d56b77a0bc 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -181,7 +181,7 @@ StructuredPushConsumer_i::push_structured_event ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") && + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") && 0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.domain_name, "")) { const CORBA::Any * any; @@ -406,7 +406,7 @@ SequencePushConsumer_i::push_structured_events ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") && + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") && 0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.domain_name, "")) { CORBA::ULong seq = 0; @@ -1737,7 +1737,7 @@ int Consumer_Main::run (void) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int result = -1; Consumer_Main app; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index df7edd2aae6..e50d249db47 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -1215,7 +1215,7 @@ int Supplier_Main::run (void) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int result = -1; Supplier_Main app; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 26532667d31..53a63ee1a8f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -4,7 +4,7 @@ #include "RedGreen_Test.h" int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_High_Res_Timer::calibrate (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 25bd9aefb74..8795fa6be56 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -547,7 +547,7 @@ Notify_Throughput::dump_results (void) /***************************************************************************/ int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_High_Res_Timer::calibrate (); diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index de9850a6acd..0696947c358 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -657,7 +657,7 @@ Client::test_get_property_value (void) } int -main (int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index 11880dad81d..7eb54e76f2c 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -434,7 +434,7 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n) } int -main (int argc, char *argv []) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 3dd1774a9b9..b2e3a67c054 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -23,7 +23,7 @@ ACE_RCSID(CosPropertyService, server, "$Id$") // Main program int -main (int argc, char ** argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index 4d51cdb0b34..78edcb2ebd3 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -51,7 +51,7 @@ parse_args (int argc, char *argv []) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) { diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index 811efaad8a7..6bc83b4218a 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -49,7 +49,7 @@ parse_args (int argc, char *argv []) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) { diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index 0a0fb3ba803..4f2cbe98442 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -19,7 +19,7 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 22fcb203cc9..af64450f88d 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -44,7 +44,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index d3bc3dba7d2..a6f4ff7c4d5 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp index 2e7121199a2..9d1672e8db9 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index 461b5b0fed4..743fbe4865c 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char * argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp index 85629ff279a..cf135212f1e 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/client.cpp @@ -124,7 +124,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { bool set_cert_file = true; try diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp index 64e4c1fce74..6ecebab4999 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { @@ -130,7 +130,7 @@ main (int argc, char *argv[]) // Clear the STDERR flags so that the first expected // failed connection attempt by the client doesn't trigger an - // error on the scoreboard. The flag is also set in the + // error on the scoreboard. The flag is also set in the // Foo_i::baz() method since the connection has been successfully // made by that time. ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR); diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp index 16035341129..b1152296d42 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp @@ -3,7 +3,7 @@ #include "MessengerC.h" int -main(int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp index 93973891e52..4200c1a6d3d 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp @@ -5,7 +5,7 @@ const char *ior_output_file = "server.ior"; int -main(int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp index eb9df0f1516..02cc2fb5797 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Callback, const char *cert_file = "cacert.pem"; int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp index ab355c2317f..10dd63f17b3 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Callback, const char *cert_file = "cacert.pem"; int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index 9176b335a3c..63089aa0cbf 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -48,7 +48,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try @@ -94,7 +94,7 @@ main (int argc, char *argv[]) catch (const CORBA::COMM_FAILURE&) { // If this happens second time then we are done. - if (i != 0) + if (i != 0) throw; // Waiting for server to come back diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index f30ec4062b9..891e73774b4 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp index ae351becf32..d71169fbc8a 100644 --- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp +++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp @@ -46,7 +46,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb; diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp index 2119425d950..cd71f6115e4 100644 --- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp +++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp @@ -141,7 +141,7 @@ parse_objref (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { if (parse_args (argc, argv) != 0) return 1; diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index f825883856c..8fdd9e230f0 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -51,7 +51,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp index 7007f79e956..fd2a9c66c1f 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp @@ -39,7 +39,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index c226ffb5fc6..2ab78193c18 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -53,7 +53,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp index c9d5ca31f95..57989276cdd 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp @@ -60,7 +60,7 @@ parse_args (int argc, char *argv[]) int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index b573bed536b..5e5047464c3 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -122,7 +122,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index 5315ff14771..26c1e5ee695 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index 28864874d31..f4df2a687ee 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -1069,7 +1069,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CosNaming_Client cosnaming_client; diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index d13483ef0bb..270c77d06ab 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -366,9 +366,9 @@ MT_Test::execute (TAO_Naming_Client &root_context) { PortableServer::ObjectId_var id_act = this->poa_->activate_object (test_obj_impl); - + CORBA::Object_var object_act = this->poa_->id_to_reference (id_act.in ()); - + test_ref_ = Test_Object::_narrow (object_act.in ()); @@ -1157,7 +1157,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // This function runs the test. int -main (int argc, char **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { CosNaming_Client cosnaming_client; diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index 690b329a7d7..855b3ef59e4 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Time, client, "$Id$") // This function runs the Time Service client test. int -main (int argc, char *argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Client_i client; diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 2a7ed294e0f..7cf8f596609 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -29,7 +29,7 @@ parse_args (int argc, char *argv[], } int -main (int argc, char** argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index adb0d0b4042..e6de3502fb1 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Trading, "$Id$") int -main (int argc, char** argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 9393d00cbf1..001b96bed52 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Trading, import_test, "$Id$") int -main (int argc, char** argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { |