summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorAbdullah Sowayan <sowayan@users.noreply.github.com>2007-06-30 18:43:31 +0000
committerAbdullah Sowayan <sowayan@users.noreply.github.com>2007-06-30 18:43:31 +0000
commit21e1db2e50febda05c8ebc08b4a992576ca57f72 (patch)
tree34905f0f48c0c1b5812cadcbe7cc351159e8884d /TAO
parent39c3017f1993e575733caafebe7ff0ed566042a3 (diff)
downloadATCD-21e1db2e50febda05c8ebc08b4a992576ca57f72.tar.gz
Sat Jun 30 16:58:36 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog436
-rw-r--r--TAO/tests/AMH_Exceptions/client.cpp2
-rw-r--r--TAO/tests/AMH_Exceptions/server.cpp6
-rw-r--r--TAO/tests/AMH_Oneway/client.cpp2
-rw-r--r--TAO/tests/AMH_Oneway/server.cpp2
-rw-r--r--TAO/tests/AMI/client.cpp2
-rw-r--r--TAO/tests/AMI/server.cpp2
-rw-r--r--TAO/tests/AMI/simple_client.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/admin.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/client.cpp2
-rw-r--r--TAO/tests/AMI_Buffering/server.cpp2
-rw-r--r--TAO/tests/AMI_Timeouts/client.cpp2
-rw-r--r--TAO/tests/AMI_Timeouts/server.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/client.cpp2
-rw-r--r--TAO/tests/Abstract_Interface/server.cpp2
-rw-r--r--TAO/tests/Any/Recursive/client.cpp2
-rw-r--r--TAO/tests/Any/Recursive/server.cpp2
-rw-r--r--TAO/tests/BiDirectional/client.cpp2
-rw-r--r--TAO/tests/BiDirectional/server.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/client.cpp2
-rw-r--r--TAO/tests/BiDirectional_DelayedUpcall/server.cpp2
-rw-r--r--TAO/tests/BiDirectional_MultipleORB/destroy.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/client.cpp2
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/server.cpp2
-rw-r--r--TAO/tests/Big_AMI/client.cpp2
-rw-r--r--TAO/tests/Big_AMI/server.cpp2
-rw-r--r--TAO/tests/Big_Oneways/client.cpp2
-rw-r--r--TAO/tests/Big_Oneways/server.cpp2
-rw-r--r--TAO/tests/Big_Reply/client.cpp2
-rw-r--r--TAO/tests/Big_Reply/server.cpp2
-rw-r--r--TAO/tests/Big_Request_Muxing/client.cpp2
-rw-r--r--TAO/tests/Big_Request_Muxing/server.cpp2
-rw-r--r--TAO/tests/Big_Twoways/client.cpp2
-rw-r--r--TAO/tests/Big_Twoways/server.cpp2
-rw-r--r--TAO/tests/Blocking_Sync_None/client.cpp2
-rw-r--r--TAO/tests/Blocking_Sync_None/server.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1020_Basic_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1020_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1269_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1270_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1330_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1330_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1361_Regression/shutdown.cpp2
-rw-r--r--TAO/tests/Bug_1476_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1476_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1476_Test/client.cpp2
-rw-r--r--TAO/tests/Bug_1482_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1482_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/Threaded_Client.cpp2
-rw-r--r--TAO/tests/Bug_1495_Regression/Threaded_Server.cpp2
-rw-r--r--TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1551_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1568_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1568_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1627_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1627_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1635_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1670_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1670_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1676_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_1676_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_1693_Test/client.cpp2
-rw-r--r--TAO/tests/Bug_1904_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2084_Regression/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Bug_2174_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2183_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2183_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2186_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2186_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2188_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2188_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2201_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2289_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2289_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2328_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2328_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2349_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2349_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2356_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2356_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2399_Regression/test.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2417_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2429_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2494_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2503_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2593_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2593_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2595_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2595_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2654_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2669_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2678_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2683_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2683_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2702_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2792_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2795_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2804_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2805_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2844_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2869_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2909_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2918_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2966_Regression/server.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/MessengerClient.cpp2
-rw-r--r--TAO/tests/Bug_933_Regression/MessengerServer.cpp2
-rw-r--r--TAO/tests/CDR/allocator.cpp2
-rw-r--r--TAO/tests/CDR/basic_types.cpp2
-rw-r--r--TAO/tests/CDR/growth.cpp2
-rw-r--r--TAO/tests/CDR/tc.cpp2
-rw-r--r--TAO/tests/COIOP/COIOP_Simple_Test.cpp2
-rw-r--r--TAO/tests/COIOP/COIOP_Test.cpp2
-rw-r--r--TAO/tests/CORBA_e_Implicit_Activation/server.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp2
-rw-r--r--TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/Cache_Growth_Test/client.cpp2
-rw-r--r--TAO/tests/Cache_Growth_Test/server.cpp2
-rw-r--r--TAO/tests/CallbackTest/client.cpp2
-rw-r--r--TAO/tests/CallbackTest/server.cpp2
-rw-r--r--TAO/tests/Client_Leaks/child.cpp2
-rw-r--r--TAO/tests/Client_Leaks/client.cpp2
-rw-r--r--TAO/tests/Client_Leaks/server.cpp2
-rw-r--r--TAO/tests/Codec/client.cpp2
-rw-r--r--TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp2
-rw-r--r--TAO/tests/Collocation_Tests/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Compression/server.cpp2
-rw-r--r--TAO/tests/Connect_Strategy_Test/client.cpp2
-rw-r--r--TAO/tests/Connect_Strategy_Test/server.cpp2
-rw-r--r--TAO/tests/Connection_Failure/client.cpp2
-rw-r--r--TAO/tests/Connection_Purging/client.cpp2
-rw-r--r--TAO/tests/Connection_Purging/server.cpp2
-rw-r--r--TAO/tests/Connection_Timeout/client.cpp2
-rw-r--r--TAO/tests/Crash_On_Write/client.cpp2
-rw-r--r--TAO/tests/Crash_On_Write/server.cpp2
-rw-r--r--TAO/tests/Crashed_Callback/client.cpp2
-rw-r--r--TAO/tests/Crashed_Callback/server.cpp2
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp2
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp2
-rw-r--r--TAO/tests/DIOP/client.cpp2
-rw-r--r--TAO/tests/DIOP/server.cpp2
-rw-r--r--TAO/tests/DSI_AMH/client.cpp2
-rw-r--r--TAO/tests/DSI_AMH/server.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/client.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/gateway.cpp2
-rw-r--r--TAO/tests/DSI_AMI_Gateway/server.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/client.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/gateway.cpp2
-rw-r--r--TAO/tests/DSI_Gateway/server.cpp2
-rw-r--r--TAO/tests/DiffServ/client.cpp2
-rw-r--r--TAO/tests/DiffServ/server.cpp2
-rw-r--r--TAO/tests/Explicit_Event_Loop/client.cpp2
-rw-r--r--TAO/tests/Explicit_Event_Loop/server.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/client.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/server.cpp2
-rw-r--r--TAO/tests/FL_Cube/server.cpp2
-rw-r--r--TAO/tests/Faults/client.cpp2
-rw-r--r--TAO/tests/Faults/middle.cpp2
-rw-r--r--TAO/tests/Faults/ping.cpp2
-rw-r--r--TAO/tests/Faults/pong.cpp2
-rw-r--r--TAO/tests/Faults/server.cpp2
-rw-r--r--TAO/tests/File_IO/client.cpp2
-rw-r--r--TAO/tests/File_IO/server.cpp2
-rw-r--r--TAO/tests/Forwarding/client.cpp2
-rw-r--r--TAO/tests/Forwarding/server.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp2
-rw-r--r--TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp2
-rw-r--r--TAO/tests/Hang_Shutdown/client.cpp2
-rw-r--r--TAO/tests/Hang_Shutdown/server.cpp2
-rw-r--r--TAO/tests/Hello/client.cpp2
-rw-r--r--TAO/tests/Hello/server.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/client.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/server.cpp2
-rw-r--r--TAO/tests/IDL_Test/main.cpp2
-rw-r--r--TAO/tests/IORManipulation/IORTest.cpp2
-rw-r--r--TAO/tests/IORManipulation/filter/server.cpp2
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp2
-rw-r--r--TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp2
-rw-r--r--TAO/tests/IPV6/client.cpp2
-rw-r--r--TAO/tests/IPV6/server.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_test_client.cpp2
-rw-r--r--TAO/tests/InterOp-Naming/INS_test_server.cpp2
-rw-r--r--TAO/tests/Leader_Followers/client.cpp2
-rw-r--r--TAO/tests/Leader_Followers/server.cpp2
-rw-r--r--TAO/tests/LongDouble/client.cpp2
-rw-r--r--TAO/tests/LongDouble/server.cpp2
-rw-r--r--TAO/tests/LongUpcalls/ami_client.cpp2
-rw-r--r--TAO/tests/LongUpcalls/ami_server.cpp2
-rw-r--r--TAO/tests/LongUpcalls/blocking_client.cpp2
-rw-r--r--TAO/tests/LongUpcalls/blocking_server.cpp2
-rw-r--r--TAO/tests/MProfile/client.cpp2
-rw-r--r--TAO/tests/MProfile/server.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/client.cpp2
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/server.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/client.cpp2
-rw-r--r--TAO/tests/MProfile_Forwarding/server.cpp2
-rw-r--r--TAO/tests/MT_BiDir/client.cpp2
-rw-r--r--TAO/tests/MT_BiDir/server.cpp2
-rw-r--r--TAO/tests/MT_Client/client.cpp2
-rw-r--r--TAO/tests/MT_Client/orb_creation.cpp2
-rw-r--r--TAO/tests/MT_Client/server.cpp2
-rw-r--r--TAO/tests/MT_Server/client.cpp2
-rw-r--r--TAO/tests/MT_Server/server.cpp2
-rw-r--r--TAO/tests/MT_Timeout/client.cpp2
-rw-r--r--TAO/tests/MT_Timeout/server.cpp2
-rw-r--r--TAO/tests/Multiple_Inheritance/client.cpp2
-rw-r--r--TAO/tests/Multiple_Inheritance/server.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/client.cpp2
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/server.cpp2
-rw-r--r--TAO/tests/Muxing/client.cpp2
-rw-r--r--TAO/tests/Muxing/server.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/client.cpp2
-rw-r--r--TAO/tests/Native_Exceptions/server.cpp2
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/server.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/client.cpp2
-rw-r--r--TAO/tests/Nested_Event_Loop/server.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/client.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/scavenger.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/server.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/client.cpp2
-rw-r--r--TAO/tests/No_Server_MT_Connect_Test/server.cpp2
-rw-r--r--TAO/tests/OBV/Any/client.cpp2
-rw-r--r--TAO/tests/OBV/Any/server.cpp2
-rw-r--r--TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp2
-rw-r--r--TAO/tests/OBV/Factory/client.cpp2
-rw-r--r--TAO/tests/OBV/Factory/server.cpp2
-rw-r--r--TAO/tests/OBV/Forward/client.cpp2
-rw-r--r--TAO/tests/OBV/Forward/server.cpp2
-rw-r--r--TAO/tests/OBV/Simple/client.cpp2
-rw-r--r--TAO/tests/OBV/Simple/server.cpp2
-rw-r--r--TAO/tests/OBV/Supports/client.cpp2
-rw-r--r--TAO/tests/OBV/Supports/server.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/client.cpp2
-rw-r--r--TAO/tests/OBV/TC_Alignment/server.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/client.cpp2
-rw-r--r--TAO/tests/OBV/Truncatable/server.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/client.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/server.cpp2
-rw-r--r--TAO/tests/ORB_destroy/ORB_destroy.cpp2
-rw-r--r--TAO/tests/ORB_init/ORB_init.cpp2
-rw-r--r--TAO/tests/ORB_init/Portspan/server.cpp2
-rw-r--r--TAO/tests/ORB_shutdown/server.cpp2
-rw-r--r--TAO/tests/ORT/client.cpp2
-rw-r--r--TAO/tests/Objref_Sequence_Test/client.cpp2
-rw-r--r--TAO/tests/Objref_Sequence_Test/server.cpp2
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.cpp2
-rw-r--r--TAO/tests/OctetSeq/client.cpp2
-rw-r--r--TAO/tests/OctetSeq/server.cpp2
-rw-r--r--TAO/tests/Ondemand_Write/client.cpp2
-rw-r--r--TAO/tests/Ondemand_Write/server.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/admin.cpp2
-rw-r--r--TAO/tests/Oneway_Buffering/client.cpp4
-rw-r--r--TAO/tests/Oneway_Buffering/server.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/client.cpp2
-rw-r--r--TAO/tests/Oneways_Invoking_Twoways/server.cpp2
-rw-r--r--TAO/tests/Optimized_Connection/oc_client.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/client.cpp2
-rw-r--r--TAO/tests/POA/Bug_1592_Regression/server.cpp2
-rw-r--r--TAO/tests/POA/Bug_2511_Regression/server.cpp2
-rw-r--r--TAO/tests/POA/Current/Current.cpp2
-rw-r--r--TAO/tests/POA/Deactivate_Object/server.cpp2
-rw-r--r--TAO/tests/POA/Default_Servant/Default_Servant.cpp2
-rw-r--r--TAO/tests/POA/EndpointPolicy/client.cpp2
-rw-r--r--TAO/tests/POA/EndpointPolicy/server.cpp2
-rw-r--r--TAO/tests/POA/Etherealization/Etherealization.cpp2
-rw-r--r--TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp2
-rw-r--r--TAO/tests/POA/Identity/Identity.cpp2
-rw-r--r--TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp2
-rw-r--r--TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp2
-rw-r--r--TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp2
-rw-r--r--TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp2
-rw-r--r--TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp2
-rw-r--r--TAO/tests/POA/POA_Destruction/POA_Destruction.cpp2
-rw-r--r--TAO/tests/POA/Persistent_ID/client.cpp2
-rw-r--r--TAO/tests/POA/Persistent_ID/server.cpp2
-rw-r--r--TAO/tests/POA/Policies/Policies.cpp2
-rw-r--r--TAO/tests/POA/Reference_Counting/test.cpp2
-rw-r--r--TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/client.cpp2
-rw-r--r--TAO/tests/Parallel_Connect_Strategy/server.cpp2
-rw-r--r--TAO/tests/Param_Test/anyop.cpp2
-rw-r--r--TAO/tests/Param_Test/driver.cpp2
-rw-r--r--TAO/tests/Param_Test/server.cpp2
-rw-r--r--TAO/tests/Permanent_Forward/StubTest.cpp2
-rw-r--r--TAO/tests/Policies/Manipulation.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlot/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlot/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_1559/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2088/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Redirection/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Slot/driver.cpp2
-rw-r--r--TAO/tests/QtTests/client.cpp2
-rw-r--r--TAO/tests/QtTests/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Banded_Connections/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Client_Protocol/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Collocation/Collocation.cpp2
-rw-r--r--TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Diffserv/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Explicit_Binding/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Linear_Priority/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/ORB_init/ORB_init.cpp2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Persistent_IOR/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policies/Policies.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Policy_Combinations/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Private_Connection/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/RTMutex/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Server_Protocol/server.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Thread_Pool/server.cpp2
-rw-r--r--TAO/tests/RTScheduling/Current/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/DT_Spawn/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp2
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp2
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/test.cpp2
-rw-r--r--TAO/tests/RTScheduling/VoidData/test_client.cpp2
-rw-r--r--TAO/tests/Reliable_Oneways/client.cpp2
-rw-r--r--TAO/tests/Reliable_Oneways/server.cpp2
-rw-r--r--TAO/tests/Servant_To_Reference_Test/server.cpp2
-rw-r--r--TAO/tests/Server_Connection_Purging/client.cpp2
-rw-r--r--TAO/tests/Server_Connection_Purging/server.cpp2
-rw-r--r--TAO/tests/Server_Leaks/client.cpp2
-rw-r--r--TAO/tests/Server_Leaks/server.cpp2
-rw-r--r--TAO/tests/Server_Port_Zero/server.cpp2
-rw-r--r--TAO/tests/Single_Read/client.cpp2
-rw-r--r--TAO/tests/Single_Read/server.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/server.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/server.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/server.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/server.cpp2
-rw-r--r--TAO/tests/Stack_Recursion/client.cpp2
-rw-r--r--TAO/tests/Stack_Recursion/server.cpp2
-rw-r--r--TAO/tests/Strategies/client.cpp2
-rw-r--r--TAO/tests/Strategies/server.cpp2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/client.cpp2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/server.cpp2
-rw-r--r--TAO/tests/Timeout/server.cpp2
-rw-r--r--TAO/tests/TransportCurrent/Framework/simple.cpp2
-rw-r--r--TAO/tests/Two_Objects/client.cpp2
-rw-r--r--TAO/tests/Two_Objects/server.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/client.cpp2
-rw-r--r--TAO/tests/Typedef_String_Array/server.cpp2
-rw-r--r--TAO/tests/UNKNOWN_Exception/client.cpp2
-rw-r--r--TAO/tests/UNKNOWN_Exception/server.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/client.cpp2
-rw-r--r--TAO/tests/Xt_Stopwatch/server.cpp2
429 files changed, 867 insertions, 431 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6cc790c597a..dfd42777be1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,439 @@
+Sat Jun 30 16:58:36 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
+
+ * tests/AMH_Exceptions/client.cpp:
+ * tests/AMH_Exceptions/server.cpp:
+ * tests/AMH_Oneway/client.cpp:
+ * tests/AMH_Oneway/server.cpp:
+ * tests/AMI/client.cpp:
+ * tests/AMI/server.cpp:
+ * tests/AMI/simple_client.cpp:
+ * tests/AMI_Buffering/admin.cpp:
+ * tests/AMI_Buffering/client.cpp:
+ * tests/AMI_Buffering/server.cpp:
+ * tests/AMI_Timeouts/client.cpp:
+ * tests/AMI_Timeouts/server.cpp:
+ * tests/Abstract_Interface/client.cpp:
+ * tests/Abstract_Interface/server.cpp:
+ * tests/Any/Recursive/client.cpp:
+ * tests/Any/Recursive/server.cpp:
+ * tests/BiDirectional/client.cpp:
+ * tests/BiDirectional/server.cpp:
+ * tests/BiDirectional_DelayedUpcall/client.cpp:
+ * tests/BiDirectional_DelayedUpcall/server.cpp:
+ * tests/BiDirectional_MultipleORB/destroy.cpp:
+ * tests/BiDirectional_NestedUpcall/client.cpp:
+ * tests/BiDirectional_NestedUpcall/server.cpp:
+ * tests/Big_AMI/client.cpp:
+ * tests/Big_AMI/server.cpp:
+ * tests/Big_Oneways/client.cpp:
+ * tests/Big_Oneways/server.cpp:
+ * tests/Big_Reply/client.cpp:
+ * tests/Big_Reply/server.cpp:
+ * tests/Big_Request_Muxing/client.cpp:
+ * tests/Big_Request_Muxing/server.cpp:
+ * tests/Big_Twoways/client.cpp:
+ * tests/Big_Twoways/server.cpp:
+ * tests/Blocking_Sync_None/client.cpp:
+ * tests/Blocking_Sync_None/server.cpp:
+ * tests/Bug_1020_Basic_Regression/client.cpp:
+ * tests/Bug_1020_Basic_Regression/server.cpp:
+ * tests/Bug_1020_Regression/client.cpp:
+ * tests/Bug_1020_Regression/server.cpp:
+ * tests/Bug_1269_Regression/client.cpp:
+ * tests/Bug_1269_Regression/server.cpp:
+ * tests/Bug_1269_Regression/shutdown.cpp:
+ * tests/Bug_1270_Regression/client.cpp:
+ * tests/Bug_1270_Regression/server.cpp:
+ * tests/Bug_1270_Regression/shutdown.cpp:
+ * tests/Bug_1330_Regression/client.cpp:
+ * tests/Bug_1330_Regression/server.cpp:
+ * tests/Bug_1361_Regression/client.cpp:
+ * tests/Bug_1361_Regression/server.cpp:
+ * tests/Bug_1361_Regression/shutdown.cpp:
+ * tests/Bug_1476_Regression/client.cpp:
+ * tests/Bug_1476_Regression/server.cpp:
+ * tests/Bug_1476_Test/client.cpp:
+ * tests/Bug_1482_Regression/client.cpp:
+ * tests/Bug_1482_Regression/server.cpp:
+ * tests/Bug_1495_Regression/Threaded_Client.cpp:
+ * tests/Bug_1495_Regression/Threaded_Server.cpp:
+ * tests/Bug_1535_Regression/bug_1535_regression.cpp:
+ * tests/Bug_1551_Regression/client.cpp:
+ * tests/Bug_1551_Regression/server.cpp:
+ * tests/Bug_1568_Regression/client.cpp:
+ * tests/Bug_1568_Regression/server.cpp:
+ * tests/Bug_1627_Regression/client.cpp:
+ * tests/Bug_1627_Regression/server.cpp:
+ * tests/Bug_1635_Regression/client.cpp:
+ * tests/Bug_1670_Regression/client.cpp:
+ * tests/Bug_1670_Regression/server.cpp:
+ * tests/Bug_1676_Regression/client.cpp:
+ * tests/Bug_1676_Regression/server.cpp:
+ * tests/Bug_1693_Test/client.cpp:
+ * tests/Bug_1904_Regression/test.cpp:
+ * tests/Bug_2084_Regression/Collocated_Test.cpp:
+ * tests/Bug_2174_Regression/server.cpp:
+ * tests/Bug_2183_Regression/client.cpp:
+ * tests/Bug_2183_Regression/server.cpp:
+ * tests/Bug_2186_Regression/client.cpp:
+ * tests/Bug_2186_Regression/server.cpp:
+ * tests/Bug_2188_Regression/client.cpp:
+ * tests/Bug_2188_Regression/server.cpp:
+ * tests/Bug_2201_Regression/test.cpp:
+ * tests/Bug_2289_Regression/client.cpp:
+ * tests/Bug_2289_Regression/server.cpp:
+ * tests/Bug_2328_Regression/client.cpp:
+ * tests/Bug_2328_Regression/server.cpp:
+ * tests/Bug_2349_Regression/client.cpp:
+ * tests/Bug_2349_Regression/server.cpp:
+ * tests/Bug_2356_Regression/client.cpp:
+ * tests/Bug_2356_Regression/server.cpp:
+ * tests/Bug_2399_Regression/test.cpp:
+ * tests/Bug_2417_Regression/client.cpp:
+ * tests/Bug_2417_Regression/server.cpp:
+ * tests/Bug_2429_Regression/client.cpp:
+ * tests/Bug_2429_Regression/server.cpp:
+ * tests/Bug_2494_Regression/client.cpp:
+ * tests/Bug_2494_Regression/server.cpp:
+ * tests/Bug_2503_Regression/client.cpp:
+ * tests/Bug_2503_Regression/server.cpp:
+ * tests/Bug_2593_Regression/client.cpp:
+ * tests/Bug_2593_Regression/server.cpp:
+ * tests/Bug_2595_Regression/client.cpp:
+ * tests/Bug_2595_Regression/server.cpp:
+ * tests/Bug_2654_Regression/client.cpp:
+ * tests/Bug_2654_Regression/server.cpp:
+ * tests/Bug_2669_Regression/client.cpp:
+ * tests/Bug_2678_Regression/client.cpp:
+ * tests/Bug_2683_Regression/client.cpp:
+ * tests/Bug_2683_Regression/server.cpp:
+ * tests/Bug_2702_Regression/client.cpp:
+ * tests/Bug_2792_Regression/client.cpp:
+ * tests/Bug_2795_Regression/client.cpp:
+ * tests/Bug_2804_Regression/client.cpp:
+ * tests/Bug_2804_Regression/server.cpp:
+ * tests/Bug_2805_Regression/client.cpp:
+ * tests/Bug_2844_Regression/client.cpp:
+ * tests/Bug_2844_Regression/server.cpp:
+ * tests/Bug_2869_Regression/client.cpp:
+ * tests/Bug_2909_Regression/client.cpp:
+ * tests/Bug_2918_Regression/client.cpp:
+ * tests/Bug_2918_Regression/server.cpp:
+ * tests/Bug_2966_Regression/client.cpp:
+ * tests/Bug_2966_Regression/server.cpp:
+ * tests/Bug_933_Regression/MessengerClient.cpp:
+ * tests/Bug_933_Regression/MessengerServer.cpp:
+ * tests/CDR/allocator.cpp:
+ * tests/CDR/basic_types.cpp:
+ * tests/CDR/growth.cpp:
+ * tests/CDR/tc.cpp:
+ * tests/COIOP/COIOP_Simple_Test.cpp:
+ * tests/COIOP/COIOP_Test.cpp:
+ * tests/CORBA_e_Implicit_Activation/server.cpp:
+ * tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h:
+ * tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp:
+ * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp:
+ * tests/Cache_Growth_Test/client.cpp:
+ * tests/Cache_Growth_Test/server.cpp:
+ * tests/CallbackTest/client.cpp:
+ * tests/CallbackTest/server.cpp:
+ * tests/Client_Leaks/child.cpp:
+ * tests/Client_Leaks/client.cpp:
+ * tests/Client_Leaks/server.cpp:
+ * tests/Codec/client.cpp:
+ * tests/Collocation_Exception_Test/Collocated_Test.cpp:
+ * tests/Collocation_Oneway_Tests/Collocated_Test.cpp:
+ * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
+ * tests/Collocation_Tests/Collocated_Test.cpp:
+ * tests/Compression/server.cpp:
+ * tests/Connect_Strategy_Test/client.cpp:
+ * tests/Connect_Strategy_Test/server.cpp:
+ * tests/Connection_Failure/client.cpp:
+ * tests/Connection_Purging/client.cpp:
+ * tests/Connection_Purging/server.cpp:
+ * tests/Connection_Timeout/client.cpp:
+ * tests/Crash_On_Write/client.cpp:
+ * tests/Crash_On_Write/server.cpp:
+ * tests/Crashed_Callback/client.cpp:
+ * tests/Crashed_Callback/server.cpp:
+ * tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp:
+ * tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp:
+ * tests/DIOP/client.cpp:
+ * tests/DIOP/server.cpp:
+ * tests/DSI_AMH/client.cpp:
+ * tests/DSI_AMH/server.cpp:
+ * tests/DSI_AMI_Gateway/client.cpp:
+ * tests/DSI_AMI_Gateway/gateway.cpp:
+ * tests/DSI_AMI_Gateway/server.cpp:
+ * tests/DSI_Gateway/client.cpp:
+ * tests/DSI_Gateway/gateway.cpp:
+ * tests/DSI_Gateway/server.cpp:
+ * tests/DiffServ/client.cpp:
+ * tests/DiffServ/server.cpp:
+ * tests/Explicit_Event_Loop/client.cpp:
+ * tests/Explicit_Event_Loop/server.cpp:
+ * tests/Exposed_Policies/client.cpp:
+ * tests/Exposed_Policies/server.cpp:
+ * tests/FL_Cube/server.cpp:
+ * tests/Faults/client.cpp:
+ * tests/Faults/middle.cpp:
+ * tests/Faults/ping.cpp:
+ * tests/Faults/pong.cpp:
+ * tests/Faults/server.cpp:
+ * tests/File_IO/client.cpp:
+ * tests/File_IO/server.cpp:
+ * tests/Forwarding/client.cpp:
+ * tests/Forwarding/server.cpp:
+ * tests/GIOP_Fragments/Java_Big_Reply/client.cpp:
+ * tests/GIOP_Fragments/Java_Big_Request/server.cpp:
+ * tests/GIOP_Fragments/PMB_With_Fragments/server.cpp:
+ * tests/Hang_Shutdown/client.cpp:
+ * tests/Hang_Shutdown/server.cpp:
+ * tests/Hello/client.cpp:
+ * tests/Hello/server.cpp:
+ * tests/ICMG_Any_Bug/client.cpp:
+ * tests/ICMG_Any_Bug/server.cpp:
+ * tests/IDL_Test/main.cpp:
+ * tests/IORManipulation/IORTest.cpp:
+ * tests/IORManipulation/filter/server.cpp:
+ * tests/IOR_Endpoint_Hostnames/generate_ior.cpp:
+ * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp:
+ * tests/IPV6/client.cpp:
+ * tests/IPV6/server.cpp:
+ * tests/InterOp-Naming/INS_test_client.cpp:
+ * tests/InterOp-Naming/INS_test_server.cpp:
+ * tests/Leader_Followers/client.cpp:
+ * tests/Leader_Followers/server.cpp:
+ * tests/LongDouble/client.cpp:
+ * tests/LongDouble/server.cpp:
+ * tests/LongUpcalls/ami_client.cpp:
+ * tests/LongUpcalls/ami_server.cpp:
+ * tests/LongUpcalls/blocking_client.cpp:
+ * tests/LongUpcalls/blocking_server.cpp:
+ * tests/MProfile/client.cpp:
+ * tests/MProfile/server.cpp:
+ * tests/MProfile_Connection_Timeout/client.cpp:
+ * tests/MProfile_Connection_Timeout/server.cpp:
+ * tests/MProfile_Forwarding/client.cpp:
+ * tests/MProfile_Forwarding/server.cpp:
+ * tests/MT_BiDir/client.cpp:
+ * tests/MT_BiDir/server.cpp:
+ * tests/MT_Client/client.cpp:
+ * tests/MT_Client/orb_creation.cpp:
+ * tests/MT_Client/server.cpp:
+ * tests/MT_Server/client.cpp:
+ * tests/MT_Server/server.cpp:
+ * tests/MT_Timeout/client.cpp:
+ * tests/MT_Timeout/server.cpp:
+ * tests/Multiple_Inheritance/client.cpp:
+ * tests/Multiple_Inheritance/server.cpp:
+ * tests/Muxed_GIOP_Versions/client.cpp:
+ * tests/Muxed_GIOP_Versions/server.cpp:
+ * tests/Muxing/client.cpp:
+ * tests/Muxing/server.cpp:
+ * tests/Native_Exceptions/client.cpp:
+ * tests/Native_Exceptions/server.cpp:
+ * tests/NestedUpcall/MT_Client_Test/client.cpp:
+ * tests/NestedUpcall/MT_Client_Test/server.cpp:
+ * tests/NestedUpcall/Triangle_Test/initiator.cpp:
+ * tests/NestedUpcall/Triangle_Test/server_A.cpp:
+ * tests/NestedUpcall/Triangle_Test/server_B.cpp:
+ * tests/Nested_Event_Loop/client.cpp:
+ * tests/Nested_Event_Loop/server.cpp:
+ * tests/Nested_Upcall_Crash/client.cpp:
+ * tests/Nested_Upcall_Crash/scavenger.cpp:
+ * tests/Nested_Upcall_Crash/server.cpp:
+ * tests/No_Server_MT_Connect_Test/client.cpp:
+ * tests/No_Server_MT_Connect_Test/server.cpp:
+ * tests/OBV/Any/client.cpp:
+ * tests/OBV/Any/server.cpp:
+ * tests/OBV/Collocated/Forward/Collocated_Test.cpp:
+ * tests/OBV/Factory/client.cpp:
+ * tests/OBV/Factory/server.cpp:
+ * tests/OBV/Forward/client.cpp:
+ * tests/OBV/Forward/server.cpp:
+ * tests/OBV/Simple/client.cpp:
+ * tests/OBV/Simple/server.cpp:
+ * tests/OBV/Supports/client.cpp:
+ * tests/OBV/Supports/server.cpp:
+ * tests/OBV/TC_Alignment/client.cpp:
+ * tests/OBV/TC_Alignment/server.cpp:
+ * tests/OBV/Truncatable/client.cpp:
+ * tests/OBV/Truncatable/server.cpp:
+ * tests/OBV/ValueBox/client.cpp:
+ * tests/OBV/ValueBox/server.cpp:
+ * tests/ORB_destroy/ORB_destroy.cpp:
+ * tests/ORB_init/ORB_init.cpp:
+ * tests/ORB_init/Portspan/server.cpp:
+ * tests/ORB_shutdown/server.cpp:
+ * tests/ORT/client.cpp:
+ * tests/Objref_Sequence_Test/client.cpp:
+ * tests/Objref_Sequence_Test/server.cpp:
+ * tests/OctetSeq/OctetSeq.cpp:
+ * tests/OctetSeq/client.cpp:
+ * tests/OctetSeq/server.cpp:
+ * tests/Ondemand_Write/client.cpp:
+ * tests/Ondemand_Write/server.cpp:
+ * tests/Oneway_Buffering/admin.cpp:
+ * tests/Oneway_Buffering/client.cpp:
+ * tests/Oneway_Buffering/server.cpp:
+ * tests/Oneways_Invoking_Twoways/client.cpp:
+ * tests/Oneways_Invoking_Twoways/server.cpp:
+ * tests/Optimized_Connection/oc_client.cpp:
+ * tests/POA/Bug_1592_Regression/client.cpp:
+ * tests/POA/Bug_1592_Regression/server.cpp:
+ * tests/POA/Bug_2511_Regression/server.cpp:
+ * tests/POA/Current/Current.cpp:
+ * tests/POA/Deactivate_Object/server.cpp:
+ * tests/POA/Default_Servant/Default_Servant.cpp:
+ * tests/POA/EndpointPolicy/client.cpp:
+ * tests/POA/EndpointPolicy/server.cpp:
+ * tests/POA/Etherealization/Etherealization.cpp:
+ * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp:
+ * tests/POA/Identity/Identity.cpp:
+ * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp:
+ * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp:
+ * tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp:
+ * tests/POA/Object_Reactivation/Object_Reactivation.cpp:
+ * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
+ * tests/POA/POA_Destruction/POA_Destruction.cpp:
+ * tests/POA/Persistent_ID/client.cpp:
+ * tests/POA/Persistent_ID/server.cpp:
+ * tests/POA/Policies/Policies.cpp:
+ * tests/POA/Reference_Counting/test.cpp:
+ * tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp:
+ * tests/Parallel_Connect_Strategy/client.cpp:
+ * tests/Parallel_Connect_Strategy/server.cpp:
+ * tests/Param_Test/anyop.cpp:
+ * tests/Param_Test/driver.cpp:
+ * tests/Param_Test/server.cpp:
+ * tests/Permanent_Forward/StubTest.cpp:
+ * tests/Policies/Manipulation.cpp:
+ * tests/Portable_Interceptors/AMI/client.cpp:
+ * tests/Portable_Interceptors/AMI/server.cpp:
+ * tests/Portable_Interceptors/AdvSlot/client.cpp:
+ * tests/Portable_Interceptors/AdvSlot/server.cpp:
+ * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
+ * tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
+ * tests/Portable_Interceptors/AdvSlotExt/client.cpp:
+ * tests/Portable_Interceptors/AdvSlotExt/server.cpp:
+ * tests/Portable_Interceptors/Benchmark/client.cpp:
+ * tests/Portable_Interceptors/Benchmark/server.cpp:
+ * tests/Portable_Interceptors/Bug_1559/client.cpp:
+ * tests/Portable_Interceptors/Bug_1559/server.cpp:
+ * tests/Portable_Interceptors/Bug_2088/client.cpp:
+ * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp:
+ * tests/Portable_Interceptors/Bug_2510_Regression/server.cpp:
+ * tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp:
+ * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp:
+ * tests/Portable_Interceptors/Dynamic/client.cpp:
+ * tests/Portable_Interceptors/Dynamic/server.cpp:
+ * tests/Portable_Interceptors/ForwardRequest/client.cpp:
+ * tests/Portable_Interceptors/ForwardRequest/server.cpp:
+ * tests/Portable_Interceptors/IORInterceptor/client.cpp:
+ * tests/Portable_Interceptors/IORInterceptor/server.cpp:
+ * tests/Portable_Interceptors/ORB_Shutdown/client.cpp:
+ * tests/Portable_Interceptors/ORB_Shutdown/server.cpp:
+ * tests/Portable_Interceptors/PICurrent/client.cpp:
+ * tests/Portable_Interceptors/PICurrent/server.cpp:
+ * tests/Portable_Interceptors/PolicyFactory/server.cpp:
+ * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp:
+ * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp:
+ * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp:
+ * tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp:
+ * tests/Portable_Interceptors/Redirection/client.cpp:
+ * tests/Portable_Interceptors/Redirection/server.cpp:
+ * tests/Portable_Interceptors/Register_Initial_References/server.cpp:
+ * tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp:
+ * tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp:
+ * tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp:
+ * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp:
+ * tests/Portable_Interceptors/Slot/driver.cpp:
+ * tests/QtTests/client.cpp:
+ * tests/QtTests/server.cpp:
+ * tests/RTCORBA/Banded_Connections/client.cpp:
+ * tests/RTCORBA/Banded_Connections/server.cpp:
+ * tests/RTCORBA/Client_Propagated/client.cpp:
+ * tests/RTCORBA/Client_Propagated/server.cpp:
+ * tests/RTCORBA/Client_Protocol/client.cpp:
+ * tests/RTCORBA/Client_Protocol/server.cpp:
+ * tests/RTCORBA/Collocation/Collocation.cpp:
+ * tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp:
+ * tests/RTCORBA/Diffserv/client.cpp:
+ * tests/RTCORBA/Diffserv/server.cpp:
+ * tests/RTCORBA/Dynamic_Thread_Pool/client.cpp:
+ * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp:
+ * tests/RTCORBA/Explicit_Binding/client.cpp:
+ * tests/RTCORBA/Explicit_Binding/server.cpp:
+ * tests/RTCORBA/Linear_Priority/client.cpp:
+ * tests/RTCORBA/Linear_Priority/server.cpp:
+ * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp:
+ * tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp:
+ * tests/RTCORBA/ORB_init/ORB_init.cpp:
+ * tests/RTCORBA/Persistent_IOR/client.cpp:
+ * tests/RTCORBA/Persistent_IOR/server.cpp:
+ * tests/RTCORBA/Policies/Policies.cpp:
+ * tests/RTCORBA/Policy_Combinations/client.cpp:
+ * tests/RTCORBA/Policy_Combinations/server.cpp:
+ * tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp:
+ * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp:
+ * tests/RTCORBA/Private_Connection/client.cpp:
+ * tests/RTCORBA/Private_Connection/server.cpp:
+ * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:
+ * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
+ * tests/RTCORBA/RTMutex/server.cpp:
+ * tests/RTCORBA/Server_Declared/client.cpp:
+ * tests/RTCORBA/Server_Declared/server.cpp:
+ * tests/RTCORBA/Server_Protocol/client.cpp:
+ * tests/RTCORBA/Server_Protocol/server.cpp:
+ * tests/RTCORBA/Thread_Pool/client.cpp:
+ * tests/RTCORBA/Thread_Pool/server.cpp:
+ * tests/RTScheduling/Current/test.cpp:
+ * tests/RTScheduling/DT_Spawn/test.cpp:
+ * tests/RTScheduling/Scheduling_Interceptor/test_client.cpp:
+ * tests/RTScheduling/Scheduling_Interceptor/test_server.cpp:
+ * tests/RTScheduling/Thread_Cancel/test.cpp:
+ * tests/RTScheduling/VoidData/test_client.cpp:
+ * tests/Reliable_Oneways/client.cpp:
+ * tests/Reliable_Oneways/server.cpp:
+ * tests/Servant_To_Reference_Test/server.cpp:
+ * tests/Server_Connection_Purging/client.cpp:
+ * tests/Server_Connection_Purging/server.cpp:
+ * tests/Server_Leaks/client.cpp:
+ * tests/Server_Leaks/server.cpp:
+ * tests/Server_Port_Zero/server.cpp:
+ * tests/Single_Read/client.cpp:
+ * tests/Single_Read/server.cpp:
+ * tests/Smart_Proxies/Benchmark/client.cpp:
+ * tests/Smart_Proxies/Benchmark/server.cpp:
+ * tests/Smart_Proxies/On_Demand/client.cpp:
+ * tests/Smart_Proxies/On_Demand/server.cpp:
+ * tests/Smart_Proxies/Policy/client.cpp:
+ * tests/Smart_Proxies/Policy/server.cpp:
+ * tests/Smart_Proxies/client.cpp:
+ * tests/Smart_Proxies/server.cpp:
+ * tests/Stack_Recursion/client.cpp:
+ * tests/Stack_Recursion/server.cpp:
+ * tests/Strategies/client.cpp:
+ * tests/Strategies/server.cpp:
+ * tests/Timed_Buffered_Oneways/client.cpp:
+ * tests/Timed_Buffered_Oneways/server.cpp:
+ * tests/Timeout/server.cpp:
+ * tests/TransportCurrent/Framework/simple.cpp:
+ * tests/Two_Objects/client.cpp:
+ * tests/Two_Objects/server.cpp:
+ * tests/Typedef_String_Array/client.cpp:
+ * tests/Typedef_String_Array/server.cpp:
+ * tests/UNKNOWN_Exception/client.cpp:
+ * tests/UNKNOWN_Exception/server.cpp:
+ * tests/Xt_Stopwatch/client.cpp:
+ * tests/Xt_Stopwatch/server.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.
+
Fri Jun 29 23:43:45 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
* examples/Advanced/ch_12/icp.cpp:
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 78e9bb736a2..72bf30c2804 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -5,7 +5,7 @@
const char *ior = "file://test.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int received_expected_exception = 0;
try
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 823243f15af..56e746057de 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -166,8 +166,8 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
CORBA::Object_var poa_object =
this->orb_->resolve_initial_references("RootPOA");
- PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in ());
+ PortableServer::POA_var root_poa =
+ PortableServer::POA::_narrow (poa_object.in ());
PortableServer::ObjectId_var id =
root_poa->activate_object (servant);
@@ -224,7 +224,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior)
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ST_AMH_Server amh_server (&argc, argv);
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index d36d1b52fce..52fe2036819 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -25,7 +25,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/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index afe86cc10de..7492e455f8a 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -249,7 +249,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior)
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/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 22157591b94..185486a01fb 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -183,7 +183,7 @@ public:
Handler handler;
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index 10bf82e95b2..a40fcadd326 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.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/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index d14e9d02d6b..ce58cf8f6e3 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -177,7 +177,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 6e34ed3e5a0..4b779fbf4e6 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -35,7 +35,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/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 3b570850204..f2e02565938 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -114,7 +114,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int test_failed = 0;
try
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index 000cf980d2b..34862af4a10 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/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/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index e6926258dce..3ef9beff7e0 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.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/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index db6bc8e17b9..1030ca5378c 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.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/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index 0e314cb7bd3..6fed6c27f20 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -172,7 +172,7 @@ test_exception (base_ptr abs)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::String_var retval;
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index 5f52dcbe27b..743f40c92a7 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -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/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 879a7f80214..55666ad92d6 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -426,7 +426,7 @@ struct Caller : public std::unary_function<T, void>
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -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/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index 4fe18d7c1b9..6951680621e 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/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[])
{
try
{
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index e28c2a925b3..984ee5d4ce6 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/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/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index 7b35adecdd1..9a936d2ec90 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/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[])
{
try
{
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
index ea7a3d129b6..660b7a493d2 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/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/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
index 0a2bcf74537..520a5e2f19b 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -90,7 +90,7 @@ test_with_bidir_poa (int argc,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int result = 0;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index e07eaeec63f..a7321ceefa0 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/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[])
{
try
{
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index ea7a3d129b6..660b7a493d2 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/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/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 55b703839e0..6627fecc0ab 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -119,7 +119,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp
index 10bf82e95b2..a40fcadd326 100644
--- a/TAO/tests/Big_AMI/server.cpp
+++ b/TAO/tests/Big_AMI/server.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/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index a03963bfa21..3bbb11e9690 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/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[])
{
try
{
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 3cdf32eb9f3..57308abf634 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/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/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index ce0d1c7d472..f18a4f84c00 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/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/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index af18a8004ba..a22e1ef6d44 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/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[])
{
ACE_DEBUG ((LM_DEBUG, "Starting server\n"));
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index 6af728bb252..402009f116f 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/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[])
{
ACE_DEBUG ((LM_DEBUG, "(%P) Starting client\n"));
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index e4ea0ce2e76..0a537bc5cbe 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_DEBUG ((LM_DEBUG, "(%P) Starting server\n"));
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index a03963bfa21..3bbb11e9690 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/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[])
{
try
{
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 0f3b099efaa..58a57f25f74 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/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/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 3d002c564f6..9a2227ec97c 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -43,7 +43,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/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index adca8860d1a..d6ba29c70cc 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -35,7 +35,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/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index 430babe0519..2d43ba97e85 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_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[])
{
try
{
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
index 211cbf1b3f7..41ca507b3ac 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/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/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 8da503b7384..e806888b708 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -26,7 +26,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index 65de2d1780e..7cd28cc824b 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -26,7 +26,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 7e8f800cbaa..0fd594feb4d 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -16,7 +16,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp
index 24b8d253dca..9e5e3c043fa 100644
--- a/TAO/tests/Bug_1269_Regression/server.cpp
+++ b/TAO/tests/Bug_1269_Regression/server.cpp
@@ -14,7 +14,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index 464c13d9d5f..d489a69f714 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -11,7 +11,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index a33276e7667..d5ee386a6ff 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -17,7 +17,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index f6ef264dbd8..b81454a13cb 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -14,7 +14,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index 60a7a999df2..c35d704e850 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -11,7 +11,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp
index dbe10b0d5d4..b0454f76fc7 100644
--- a/TAO/tests/Bug_1330_Regression/client.cpp
+++ b/TAO/tests/Bug_1330_Regression/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[])
{
int result = 0;
try
diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp
index 48c1971a923..83692662a90 100644
--- a/TAO/tests/Bug_1330_Regression/server.cpp
+++ b/TAO/tests/Bug_1330_Regression/server.cpp
@@ -35,7 +35,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/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 1358bc3205f..328d94c807f 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -49,7 +49,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 4de46baba8e..835a9e90cf2 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -16,7 +16,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 80aef05e9e5..6cf11b59dea 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -22,7 +22,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_DEBUG ((LM_DEBUG,
"Starting shutdown\n"));
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index 2fac30da5e8..479f93a68f0 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/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/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp
index 4e19b224566..2c0d48a026d 100644
--- a/TAO/tests/Bug_1476_Regression/server.cpp
+++ b/TAO/tests/Bug_1476_Regression/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/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp
index 8a6b4b15973..4dab919d4fe 100644
--- a/TAO/tests/Bug_1476_Test/client.cpp
+++ b/TAO/tests/Bug_1476_Test/client.cpp
@@ -84,7 +84,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/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index 75edfd038f6..deae3761d41 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/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/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index 552fb90e01a..3cae5e821ea 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -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/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
index 6b4d6417695..dcb1905fc61 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
@@ -56,7 +56,7 @@ parse_args (int argc, char *argv[])
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
// Parse command line
if (parse_args (argc, argv) == -1)
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index 0a7f011e481..4df76e13d15 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -45,7 +45,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/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index 07f4d5a4038..9fd8a8b24ab 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -184,7 +184,7 @@ test_no_implicit_activation (
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index 9cd6422805c..fb3e134df73 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/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[])
{
int retval = 0;
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index fd71f6b2ee7..b70aa044d03 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/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/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index 8ed04d4a659..a8e3a51235a 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_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[])
{
try
{
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index 6585a86fec2..4d693df7681 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -108,7 +108,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/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp
index dbe10b0d5d4..b0454f76fc7 100644
--- a/TAO/tests/Bug_1627_Regression/client.cpp
+++ b/TAO/tests/Bug_1627_Regression/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[])
{
int result = 0;
try
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index e8166ed5279..cbe22adc00b 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -35,7 +35,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/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp
index 78ff7a3d27b..aac3e960c89 100644
--- a/TAO/tests/Bug_1635_Regression/client.cpp
+++ b/TAO/tests/Bug_1635_Regression/client.cpp
@@ -4,7 +4,7 @@
#include "tao/ORB.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp
index 280ce776192..25d4f0408cf 100644
--- a/TAO/tests/Bug_1670_Regression/client.cpp
+++ b/TAO/tests/Bug_1670_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[])
{
try
{
diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp
index d7484aaa227..cb1546f3218 100644
--- a/TAO/tests/Bug_1670_Regression/server.cpp
+++ b/TAO/tests/Bug_1670_Regression/server.cpp
@@ -108,7 +108,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/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 5b778002e7a..1f3e9589d0e 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, char *argv[])
void get_stringList2(Test::Hello_var hello);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Bug_1676_Regression/server.cpp
+++ b/TAO/tests/Bug_1676_Regression/server.cpp
@@ -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/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index 8baf5225fc2..a7afff47008 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Codec,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_1904_Regression/test.cpp b/TAO/tests/Bug_1904_Regression/test.cpp
index 43e2c70132e..571f46e114b 100644
--- a/TAO/tests/Bug_1904_Regression/test.cpp
+++ b/TAO/tests/Bug_1904_Regression/test.cpp
@@ -6,7 +6,7 @@ class con_i : public virtual POA_con
};
int
-main (int , char *[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
return 0;
}
diff --git a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
index 56dd69ca8ae..5d28933e2aa 100644
--- a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
+++ b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
@@ -43,7 +43,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/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index ec48f1e0ace..def640f849a 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/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/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index 157975a01c5..dd1c2d44d8e 100644
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/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/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index bbcde579a8a..19e6819793c 100644
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_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
{
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
index 3d163843a6d..bfe94561306 100644
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ b/TAO/tests/Bug_2186_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[])
{
try
{
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
index 9631352c99f..5461e1c1598 100644
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ b/TAO/tests/Bug_2186_Regression/server.cpp
@@ -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/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index d7c5d8c6ddc..cd35ee51d39 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/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[])
{
ServerAdmin_var saobj;
CORBA::ORB_var orb;
diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp
index 4eba57f9c90..d42496dadbb 100644
--- a/TAO/tests/Bug_2188_Regression/server.cpp
+++ b/TAO/tests/Bug_2188_Regression/server.cpp
@@ -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/tests/Bug_2201_Regression/test.cpp b/TAO/tests/Bug_2201_Regression/test.cpp
index 4bc39b5ff5e..1a11bb77036 100644
--- a/TAO/tests/Bug_2201_Regression/test.cpp
+++ b/TAO/tests/Bug_2201_Regression/test.cpp
@@ -4,7 +4,7 @@
#include "TestDataC.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int retval = 0;
diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp
index e59d06f3184..c836db9bc48 100644
--- a/TAO/tests/Bug_2289_Regression/client.cpp
+++ b/TAO/tests/Bug_2289_Regression/client.cpp
@@ -39,7 +39,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/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
index 86fa59367d6..a2238531d21 100644
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ b/TAO/tests/Bug_2289_Regression/server.cpp
@@ -46,7 +46,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/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp
index 9ac10a2809d..4d7e758d083 100644
--- a/TAO/tests/Bug_2328_Regression/client.cpp
+++ b/TAO/tests/Bug_2328_Regression/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/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp
index 0bbe22b1aa4..a56c9a86dd7 100644
--- a/TAO/tests/Bug_2328_Regression/server.cpp
+++ b/TAO/tests/Bug_2328_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
{
diff --git a/TAO/tests/Bug_2349_Regression/client.cpp b/TAO/tests/Bug_2349_Regression/client.cpp
index c4a618f29f2..5d1487de278 100644
--- a/TAO/tests/Bug_2349_Regression/client.cpp
+++ b/TAO/tests/Bug_2349_Regression/client.cpp
@@ -6,7 +6,7 @@
const char* ior = "file://server.ior";
int
-main (int argc, char** argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
index df194eedbb3..b19cb0b27c3 100644
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ b/TAO/tests/Bug_2349_Regression/server.cpp
@@ -54,7 +54,7 @@ foo_i::destroy ()
int
-main (int argc, char** argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index ed9fba653b5..fb5d7cae627 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -115,7 +115,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2356_Regression/server.cpp b/TAO/tests/Bug_2356_Regression/server.cpp
index dcfb252d2c9..f9a74dec069 100644
--- a/TAO/tests/Bug_2356_Regression/server.cpp
+++ b/TAO/tests/Bug_2356_Regression/server.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/tests/Bug_2399_Regression/test.cpp b/TAO/tests/Bug_2399_Regression/test.cpp
index 1b3f75330f2..1694badb01d 100644
--- a/TAO/tests/Bug_2399_Regression/test.cpp
+++ b/TAO/tests/Bug_2399_Regression/test.cpp
@@ -3,7 +3,7 @@
#include "testC.h"
int
-main (int , char *[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
return 0;
}
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index 785386807d6..4cef41e9e91 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -15,7 +15,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 98dab84b52f..32a267a7a7d 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -16,7 +16,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 274db49b547..a6e7c8e862b 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -99,7 +99,7 @@ client_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/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
index e0087a26393..f81e3a1e6fe 100644
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ b/TAO/tests/Bug_2429_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/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index 5bc5f85acd0..b311fe68f15 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -97,7 +97,7 @@ struct Worker : ACE_Task_Base
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index bec9007b319..009328d9ff2 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -60,7 +60,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2503_Regression/client.cpp b/TAO/tests/Bug_2503_Regression/client.cpp
index 67bbc811fcd..a8f7e9ee8d0 100644
--- a/TAO/tests/Bug_2503_Regression/client.cpp
+++ b/TAO/tests/Bug_2503_Regression/client.cpp
@@ -9,7 +9,7 @@ void test_remote_calls(CORBA::ORB_ptr orb);
void test_colocated_calls(CORBA::ORB_ptr orb);
int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2503_Regression/server.cpp b/TAO/tests/Bug_2503_Regression/server.cpp
index 558335e4e37..9e21ae43695 100644
--- a/TAO/tests/Bug_2503_Regression/server.cpp
+++ b/TAO/tests/Bug_2503_Regression/server.cpp
@@ -9,7 +9,7 @@ void parse_args(int argc, char * argv[]);
void write_ior_to_file(char const * ior);
int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp
index c0179ea8b59..213405fde89 100644
--- a/TAO/tests/Bug_2593_Regression/client.cpp
+++ b/TAO/tests/Bug_2593_Regression/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/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp
index fa9dc9c9b9b..6106f488664 100644
--- a/TAO/tests/Bug_2593_Regression/server.cpp
+++ b/TAO/tests/Bug_2593_Regression/server.cpp
@@ -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/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp
index bc61f4e4d56..3706d4e776d 100644
--- a/TAO/tests/Bug_2595_Regression/client.cpp
+++ b/TAO/tests/Bug_2595_Regression/client.cpp
@@ -36,7 +36,7 @@ parse_args (int argc, char *argv[])
void get_stringList2(Test::Hello_var hello);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Bug_2595_Regression/server.cpp
+++ b/TAO/tests/Bug_2595_Regression/server.cpp
@@ -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/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index 3b196a85a87..455959d548f 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -215,7 +215,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Worker worker (5);
try
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
index 1ee92fba8d4..a071232a117 100644
--- a/TAO/tests/Bug_2654_Regression/server.cpp
+++ b/TAO/tests/Bug_2654_Regression/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/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index bd003cf51ab..91ee4aefab0 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -48,7 +48,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int result = 0;
diff --git a/TAO/tests/Bug_2678_Regression/client.cpp b/TAO/tests/Bug_2678_Regression/client.cpp
index 45cee40a21d..4e4119f0ed7 100644
--- a/TAO/tests/Bug_2678_Regression/client.cpp
+++ b/TAO/tests/Bug_2678_Regression/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/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index e7119768255..5f3665bd1e0 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -100,7 +100,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/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp
index fe081bc045c..2edb3107881 100644
--- a/TAO/tests/Bug_2683_Regression/server.cpp
+++ b/TAO/tests/Bug_2683_Regression/server.cpp
@@ -35,7 +35,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp
index 6f1ead8ecd2..94e8d8adb04 100644
--- a/TAO/tests/Bug_2702_Regression/client.cpp
+++ b/TAO/tests/Bug_2702_Regression/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/tests/Bug_2792_Regression/client.cpp b/TAO/tests/Bug_2792_Regression/client.cpp
index 64df0c1a965..b037729a10d 100644
--- a/TAO/tests/Bug_2792_Regression/client.cpp
+++ b/TAO/tests/Bug_2792_Regression/client.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(Bug_2792_Regression,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2795_Regression/client.cpp b/TAO/tests/Bug_2795_Regression/client.cpp
index 2a7fe98c7f5..449843bb5e9 100644
--- a/TAO/tests/Bug_2795_Regression/client.cpp
+++ b/TAO/tests/Bug_2795_Regression/client.cpp
@@ -23,7 +23,7 @@ StringInoutTest (char *& so)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp
index 54fd48dad44..6a70b326038 100644
--- a/TAO/tests/Bug_2804_Regression/client.cpp
+++ b/TAO/tests/Bug_2804_Regression/client.cpp
@@ -138,7 +138,7 @@ struct Caller : public std::unary_function<T, void>
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2804_Regression/server.cpp b/TAO/tests/Bug_2804_Regression/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Bug_2804_Regression/server.cpp
+++ b/TAO/tests/Bug_2804_Regression/server.cpp
@@ -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/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index c142b0517db..18fc6160d94 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -186,7 +186,7 @@ public:
Handler handler;
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp
index 7cfb00d914a..2724d0262bd 100644
--- a/TAO/tests/Bug_2844_Regression/client.cpp
+++ b/TAO/tests/Bug_2844_Regression/client.cpp
@@ -137,7 +137,7 @@ struct Caller : public std::unary_function<T, void>
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2844_Regression/server.cpp b/TAO/tests/Bug_2844_Regression/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Bug_2844_Regression/server.cpp
+++ b/TAO/tests/Bug_2844_Regression/server.cpp
@@ -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/tests/Bug_2869_Regression/client.cpp b/TAO/tests/Bug_2869_Regression/client.cpp
index ae57dd2c7d3..1ad99ae9e39 100644
--- a/TAO/tests/Bug_2869_Regression/client.cpp
+++ b/TAO/tests/Bug_2869_Regression/client.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(Bug_2869_Regression, client, "$Id$")
const char *ior_output_file = "test.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp
index 94fe63f8f0a..cd51d4f79a0 100644
--- a/TAO/tests/Bug_2909_Regression/client.cpp
+++ b/TAO/tests/Bug_2909_Regression/client.cpp
@@ -169,7 +169,7 @@ private:
Handler handler;
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2918_Regression/client.cpp b/TAO/tests/Bug_2918_Regression/client.cpp
index 90a82c08d09..fa70932e8f9 100644
--- a/TAO/tests/Bug_2918_Regression/client.cpp
+++ b/TAO/tests/Bug_2918_Regression/client.cpp
@@ -138,7 +138,7 @@ struct Caller : public std::unary_function<T, void>
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Bug_2918_Regression/server.cpp b/TAO/tests/Bug_2918_Regression/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Bug_2918_Regression/server.cpp
+++ b/TAO/tests/Bug_2918_Regression/server.cpp
@@ -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/tests/Bug_2966_Regression/client.cpp b/TAO/tests/Bug_2966_Regression/client.cpp
index 6d78b313d5e..047108a54ce 100644
--- a/TAO/tests/Bug_2966_Regression/client.cpp
+++ b/TAO/tests/Bug_2966_Regression/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[])
{
try
{
diff --git a/TAO/tests/Bug_2966_Regression/server.cpp b/TAO/tests/Bug_2966_Regression/server.cpp
index 442317e303f..b2b4eda1d1f 100644
--- a/TAO/tests/Bug_2966_Regression/server.cpp
+++ b/TAO/tests/Bug_2966_Regression/server.cpp
@@ -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/tests/Bug_933_Regression/MessengerClient.cpp b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
index 56e144b5d43..109984f46b2 100644
--- a/TAO/tests/Bug_933_Regression/MessengerClient.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerClient.cpp
@@ -4,7 +4,7 @@
#include "tao/CodecFactory/CodecFactory.h"
int
-main( int argc, char *argv[] )
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try {
// Initialize orb
diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
index d8018c32aed..617777404c5 100644
--- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp
+++ b/TAO/tests/Bug_933_Regression/MessengerServer.cpp
@@ -5,7 +5,7 @@
const char *ior_output_file = "Messenger.ior";
int
-main( int argc, char *argv[] )
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try {
// Initialize orb
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index 7039b9b1b9c..880cbfbf630 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -65,7 +65,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 1fc2260bb62..2e0949f8620 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -212,7 +212,7 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
index cc70e4ea277..7f2a28f37e0 100644
--- a/TAO/tests/CDR/growth.cpp
+++ b/TAO/tests/CDR/growth.cpp
@@ -63,7 +63,7 @@ test_read (TAO_InputCDR &cdr, int n)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int n = 100;
int low = 64;
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 41cc6e8963a..80a4d9e4833 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -34,7 +34,7 @@ ACE_RCSID (CDR,
// verify that CDR offers the services needed for Typecode...
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/COIOP/COIOP_Simple_Test.cpp b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
index e3c1cecba77..2b8450a938c 100644
--- a/TAO/tests/COIOP/COIOP_Simple_Test.cpp
+++ b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
@@ -4,7 +4,7 @@
#include "tao/Strategies/advanced_resource.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/COIOP/COIOP_Test.cpp b/TAO/tests/COIOP/COIOP_Test.cpp
index a658fe75ebf..2b2fd315191 100644
--- a/TAO/tests/COIOP/COIOP_Test.cpp
+++ b/TAO/tests/COIOP/COIOP_Test.cpp
@@ -45,7 +45,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/tests/CORBA_e_Implicit_Activation/server.cpp b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
index b2d1a71177a..73fd48d4d35 100644
--- a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
+++ b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Hello,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int status = 1;
try
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
index 6daf932438e..bcbdb6e9e6b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
@@ -9,7 +9,7 @@
#define TEST_APP_MAIN(APP_TYPE) \
int \
-main(int argc, char* argv[]) \
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])\
{ \
ACE_LOG_MSG->priority_mask(LM_TRACE | \
LM_DEBUG | \
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index c0179ea8b59..213405fde89 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/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/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index 4b6969dfb8e..68ef500cbe1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/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/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 5269afe6e34..b7d45122416 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/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[])
{
try
{
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index 30c53df4407..649ca2753c3 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -35,7 +35,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/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp
index 3ca4ceb70e8..a078f7b9e4f 100644
--- a/TAO/tests/CallbackTest/client.cpp
+++ b/TAO/tests/CallbackTest/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/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index f58148f9669..bb10bf942ac 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -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/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index 100b0b6ad4d..01379f1c35d 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -6,7 +6,7 @@
ACE_RCSID(Client_Leaks, server, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index 05934f0336b..00673c4bb51 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -46,7 +46,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/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index 8c978062415..77488b4f84d 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.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/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index 3c2fff94d02..7e916c74242 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -174,7 +174,7 @@ test_codec (IOP::Codec_ptr codec)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int retval = 0;
try
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
index 1bb9dcf3336..cb6e1a18979 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
@@ -43,7 +43,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/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index 48cc80897c6..c05faf89b00 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -68,7 +68,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/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index 7cd0f69db32..2790e42ec7d 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -124,7 +124,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
index 5c5dae3a745..1af5263fc09 100644
--- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
@@ -41,7 +41,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/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp
index 6e9eca6f15a..d96d398167a 100644
--- a/TAO/tests/Compression/server.cpp
+++ b/TAO/tests/Compression/server.cpp
@@ -100,7 +100,7 @@ test_register_nil_compression_factory (
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int retval = 0;
try
diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp
index 43e51f6f2fe..f5bfa3ceb85 100644
--- a/TAO/tests/Connect_Strategy_Test/client.cpp
+++ b/TAO/tests/Connect_Strategy_Test/client.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/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp
index e774ea9c9a6..018daaf71e0 100644
--- a/TAO/tests/Connect_Strategy_Test/server.cpp
+++ b/TAO/tests/Connect_Strategy_Test/server.cpp
@@ -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/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index 3f008044d8d..41012833ee6 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -13,7 +13,7 @@ const char *ior =
"corbaloc:iiop:192.3.47/10007/RandomObject";
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index c2bc36d4571..4d798794264 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/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/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index 5638984749d..f0528308bb1 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.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/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 13886b7539c..15737327056 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -98,7 +98,7 @@ test_timeout (CORBA::Object_ptr object)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int retval = 1;
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index bf78ab1a7e2..a69422b0a47 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -57,7 +57,7 @@ single_iteration (Test::Oneway_Receiver_ptr oneway_receiver)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 5192c92a3db..25ee15059f6 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -35,7 +35,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/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 8d99edeca1b..6523edab9c8 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/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/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index ba57e86edae..c4ae2e38f3b 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -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/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
index 0af71b3e567..d6c00db8247 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
@@ -50,7 +50,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/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
index 603fa6b822d..54e481006bf 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
@@ -54,7 +54,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/tests/DIOP/client.cpp b/TAO/tests/DIOP/client.cpp
index 4070f2b99ee..2428ac8abd7 100644
--- a/TAO/tests/DIOP/client.cpp
+++ b/TAO/tests/DIOP/client.cpp
@@ -74,7 +74,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/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp
index b0f9c9e5b4f..60e8f71bf2f 100644
--- a/TAO/tests/DIOP/server.cpp
+++ b/TAO/tests/DIOP/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/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp
index 299c257ed14..cb23cc6dc0d 100644
--- a/TAO/tests/DSI_AMH/client.cpp
+++ b/TAO/tests/DSI_AMH/client.cpp
@@ -46,7 +46,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/tests/DSI_AMH/server.cpp b/TAO/tests/DSI_AMH/server.cpp
index 4f5e41dc839..c0db4f9fc0b 100644
--- a/TAO/tests/DSI_AMH/server.cpp
+++ b/TAO/tests/DSI_AMH/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/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp
index 1440fbf6b7b..4aa2aebab3f 100644
--- a/TAO/tests/DSI_AMI_Gateway/client.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/client.cpp
@@ -61,7 +61,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/tests/DSI_AMI_Gateway/gateway.cpp b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
index e1796d69d19..af8e67cb096 100644
--- a/TAO/tests/DSI_AMI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/gateway.cpp
@@ -54,7 +54,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/tests/DSI_AMI_Gateway/server.cpp b/TAO/tests/DSI_AMI_Gateway/server.cpp
index 2e1dda6c91d..5ee0fd887de 100644
--- a/TAO/tests/DSI_AMI_Gateway/server.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/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/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 1440fbf6b7b..4aa2aebab3f 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -61,7 +61,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/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 2a46e2da708..5697b43f6f5 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -54,7 +54,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/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index 2e1dda6c91d..5ee0fd887de 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/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/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp
index a6d9c9f8ca3..c14223ec604 100644
--- a/TAO/tests/DiffServ/client.cpp
+++ b/TAO/tests/DiffServ/client.cpp
@@ -93,7 +93,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/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index fddab01d128..8d1a5c7c94c 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -117,7 +117,7 @@ create_object (PortableServer::POA_ptr poa,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index 0051d36e0c9..5aec557694b 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -29,7 +29,7 @@
//#include <iomanip.h>
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 6cc08c3d902..6c2f9879408 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -83,7 +83,7 @@ void do_something_else()
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 1295144a34c..2483135b567 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -12,7 +12,7 @@
ACE_RCSID(tao, client, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int status = 0;
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 59e4566d509..80dd35351b3 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -19,7 +19,7 @@ ACE_RCSID(tao, server, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index f9924be0828..86e388d2cd5 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Fl_Window window(300, 300);
TAO::FlResource_Loader fl_loader;
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 21d8c75676f..6a40d22d027 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -66,7 +66,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/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 061761b2b50..13827ee526f 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -47,7 +47,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/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index 258ae146ddb..747beb37361 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -35,7 +35,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/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 2103c39c8fc..2c1d08b1962 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -106,7 +106,7 @@ run_client (CORBA::ORB_ptr orb,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 7f3da2383f6..84784786d7b 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -35,7 +35,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/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 580723389ff..5fa26ff4c68 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -148,7 +148,7 @@ MTTEST (void *args)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index cf5db4c23bc..e05652e6279 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -69,7 +69,7 @@ parse_args (int argc, char **argv)
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_HANDLE handle = ACE_OS::open ("big.txt",
O_RDWR | O_CREAT,
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index cb556184762..4409f6df023 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -64,7 +64,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index e99b92be337..b8d3a056def 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.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/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index 7af2ed8b0ad..5e4fb77963a 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/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/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 13e8f506ff6..f50b156193c 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int status = 0;
try
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index daa98837c14..7fade2e9e96 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int status = 0;
try
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index bbc4ffedbed..35af692cbea 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -239,7 +239,7 @@ namespace Test
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
return Test::try_main (argc, argv);
}
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index ea6126a7599..8a9a97193bc 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -86,7 +86,7 @@ namespace Test
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
return Test::try_main (argc, argv);
}
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 7b5d3ae87d6..d986aed8f0d 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/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/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index 442317e303f..b2b4eda1d1f 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -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/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 087a330e12d..6de9a192ef5 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.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/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index 41afe2146e6..ff27ac5ac1b 100644
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -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/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index c0fd63e717a..e1742a4ef2e 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -85,7 +85,7 @@ struct something_handler : public POA_bug_1985_c::d::AMI_somethingHandler
};
int
-main (int argc , char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int error_count = 0;
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index e47bdae2f2e..ec524094009 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -23,7 +23,7 @@ ACE_RCSID (IORManipluation,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
// The variable is declared volatile because, some compilers
// optimizes this the wrong way. A case is point is the CC compiler
diff --git a/TAO/tests/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp
index 02a565eecdf..7ba5cbed371 100644
--- a/TAO/tests/IORManipulation/filter/server.cpp
+++ b/TAO/tests/IORManipulation/filter/server.cpp
@@ -30,7 +30,7 @@ class Hello: public POA_Test::Hello
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int status = 0;
try
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index e74151bc1fc..5d00607fa99 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -12,7 +12,7 @@
ACE_RCSID (IOR_Endpoint_Hostnames, generate_ior, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index cc855a6baea..5959a2e797c 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -14,7 +14,7 @@
ACE_RCSID (IOR_Endpoint_Hostnames, list_interfaces, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_UNUSED_ARG (argc);
ACE_UNUSED_ARG (argv);
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp
index ef4e8501a8c..da3d8f52e63 100644
--- a/TAO/tests/IPV6/client.cpp
+++ b/TAO/tests/IPV6/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[])
{
try
{
diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/IPV6/server.cpp
+++ b/TAO/tests/IPV6/server.cpp
@@ -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/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index e85e052248e..e4f6773a9a3 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -9,7 +9,7 @@
#include "ace/OS_NS_string.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int i = 0;
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index 8fbb39a0bad..12310027192 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -5,7 +5,7 @@
// This is the main driver program for the INS test server.
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Server_i server;
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 1063d4680bf..ff6bd28fb07 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -225,7 +225,7 @@ private:
};
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 5d156589fc0..1a30b4517d8 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -75,7 +75,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp
index 408501970fa..7b47df53609 100644
--- a/TAO/tests/LongDouble/client.cpp
+++ b/TAO/tests/LongDouble/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;
try
diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp
index 95cfd9a41ab..bcc26cf50da 100644
--- a/TAO/tests/LongDouble/server.cpp
+++ b/TAO/tests/LongDouble/server.cpp
@@ -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/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 30095cce6fe..67f7b57b613 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_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/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 9342b91a8ae..f75a9bdca9f 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.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/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index b6dacb85770..c59482272ec 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_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/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 4077f843241..de483e78419 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.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/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 78a19985a67..70f821cf8d2 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -52,7 +52,7 @@ void
run_test (Simple_Server_ptr server);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index 3cf31dd35fd..715915b2459 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -35,7 +35,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/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index ea0aa878f16..a101bda2b09 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -57,7 +57,7 @@ CORBA::ULongLong
run_test (Simple_Server_ptr server);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 04c040ca422..1371f1c3ab4 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/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/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 9327c7d1629..c73841ab9c0 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -38,7 +38,7 @@ void
run_test (Simple_Server_ptr server);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index c88f453fd53..8569daef730 100644
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -35,7 +35,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/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 607b7fc95c2..c66b327c4ad 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/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[])
{
try
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 7c9245b4a68..4a11486b9cf 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -55,7 +55,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/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index c6b05842c49..0e12e75d009 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -76,7 +76,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 1511e12ca82..439305b2b65 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -69,7 +69,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index 7cdec34d1c9..1b1f157a469 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.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/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index ebbecd5f4c7..52a6ec80eff 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -46,7 +46,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/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 909e398c68d..3ae2bfb1907 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -61,7 +61,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index efd944e25fe..6eb22fcda8a 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -46,7 +46,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/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index f7a47c804b0..e0405f48636 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.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/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 1fbfa4fa4f0..f5753de2cf0 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -69,7 +69,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/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index bce1669808c..7cddf6b1111 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, char **argv)
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Multiple_Inheritance_i servant;
TAO_ORB_Manager orb_manager;
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 81102d228ce..20a07efc0fd 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -80,7 +80,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 0ac500a4cc4..645166d9d5b 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -120,7 +120,7 @@ private:
/***************************************************/
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index 8d25e670955..6ffbe613726 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/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/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index b10aa4b7bbb..f6ba9856b87 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.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/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index 3fd4dc66909..f6345befe7c 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/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[])
{
try
{
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 3d86811190e..08e6f630e88 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -35,7 +35,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/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 2c32f971f4b..51142c52e20 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -267,7 +267,7 @@ MT_Client::init (int argc, char **argv,
// This function runs the test.
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 5d1e4de11a9..c1b6cc61d56 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -118,7 +118,7 @@ MT_Object_Server::~MT_Object_Server (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
MT_Object_Server MT_Object_Server;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 33a1e326958..7b353dbbed7 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -269,7 +269,7 @@ Initiator_Server::~Initiator_Server (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_DEBUG ((LM_DEBUG,
"\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index ae720385ef4..a2e2531b802 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -112,7 +112,7 @@ Object_A_Server::~Object_A_Server (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Object_A_Server object_A_Server;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 0b11e3e61f4..1d2e4ae9e1f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -112,7 +112,7 @@ Object_B_Server::~Object_B_Server (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Object_B_Server object_B_Server;
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 5303d7b1a8c..40080454ab8 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -68,7 +68,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/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 94dddd83c2f..86465bee70b 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.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/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 7bbefc3538e..8b840226d21 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -30,7 +30,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index 80f36fe1c3f..f0320d41cc8 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -22,7 +22,7 @@ int
parse_args (int argc, char *argv[]);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int ret_val = 0;
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index a937ed21856..9dbba999e56 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -33,7 +33,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index 06fe9865d4e..dd90af2b30c 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -72,7 +72,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
index 7cdec34d1c9..1b1f157a469 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/server.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/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 7bd3242eea3..2911730a61b 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/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/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index 7c4ecab09c8..df8fd8c31b7 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -35,7 +35,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/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
index 3a297b25374..4c5d2a19b66 100644
--- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
@@ -41,7 +41,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/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index cceefe42598..b1aacec183a 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -66,7 +66,7 @@ no_factory (OBV_FactoryTest::Test_ptr test)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 1a04f156a47..c4e0bfeb192 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -35,7 +35,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/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index e9748ef5461..ca5d89a6832 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -80,7 +80,7 @@ dump_tree (TreeController *tc)
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index cdefd70720a..37ea7a69cd1 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/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/tests/OBV/Simple/client.cpp b/TAO/tests/OBV/Simple/client.cpp
index d4e502a26bd..5eb9280095a 100644
--- a/TAO/tests/OBV/Simple/client.cpp
+++ b/TAO/tests/OBV/Simple/client.cpp
@@ -5,7 +5,7 @@
// The client program for the application.
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Checkpoint_Client_i client;
diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
index 31b84c2b421..8cb92053d94 100644
--- a/TAO/tests/OBV/Simple/server.cpp
+++ b/TAO/tests/OBV/Simple/server.cpp
@@ -5,7 +5,7 @@
// This is the main driver program for the time and date server.
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Server<Checkpoint_i> server;
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index f904544f346..951c905fa98 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/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[])
{
try
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index 10ffff3d806..dd6f46e8896 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -6,7 +6,7 @@
const char * ior_output_file = "test.ior";
int
-main (int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp
index 1fc12bd96bb..12f4bfd5240 100644
--- a/TAO/tests/OBV/TC_Alignment/client.cpp
+++ b/TAO/tests/OBV/TC_Alignment/client.cpp
@@ -148,7 +148,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/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index c054a76d96c..c02f51ee871 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (TC_Alignment,
const char *ior_output_file = "test.ior";
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 6770fc5e73e..491093f0099 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -55,7 +55,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/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
index 6dc002a6ff3..d3b384c7465 100644
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ b/TAO/tests/OBV/Truncatable/server.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/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index 22843a63e2b..6987d629ce8 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -1419,7 +1419,7 @@ int test_boxed_union_invocations (Test * test_object)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Test_var test_object;
CORBA::ORB_var orb;
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 1c67935ce6b..754548df909 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/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/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index 61ad9caa6d5..ab05175bf31 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -112,7 +112,7 @@ test_with_funky_poa_manager (int argc,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int result = 0;
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index c96d9c59137..7c8cf3ae471 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -19,7 +19,7 @@ static const char IOR[] =
"IOR:010000001600000049444c3a43756269745f466163746f72793a312e30000000010000000000000090000000010102cd14000000616e647572696c2e6563652e7563692e6564750057fecdcd2d00000014010f004e5550000000130000000001000000006368696c645f706f61000000000001000000666163746f7279cdcdcd03000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000004f41540400000001cd0000";
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb;
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index 284d0d79b4e..ffe8ca7b1f9 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -3,7 +3,7 @@
#include "simpleI.h"
int
-main( int argc, char *argv[] )
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 09d6d131320..32e0c905bb2 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Hello,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index b14e2a4a546..77dc037ca2d 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/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/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 964ba9531e7..571c43f2a10 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.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/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 59943a0b9cc..931ed94ae84 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -137,7 +137,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 97bb5c276d9..15108829c12 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -161,7 +161,7 @@ run (char* buf, size_t bufsize,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index dad4436d34b..547f5d87292 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -55,7 +55,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/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 26bec5a3f65..f2ace5675e7 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.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/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp
index 52dc811c103..55988f304b9 100644
--- a/TAO/tests/Ondemand_Write/client.cpp
+++ b/TAO/tests/Ondemand_Write/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/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp
index edfe2b98049..c3790eede0f 100644
--- a/TAO/tests/Ondemand_Write/server.cpp
+++ b/TAO/tests/Ondemand_Write/server.cpp
@@ -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/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 0111f9cc430..fe417a22c14 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -35,7 +35,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/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index f3ec40d2b15..4a8753c740d 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -112,7 +112,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int test_failed = 0;
try
@@ -744,7 +744,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
{
CORBA::ULong receive_count =
request_count (oneway_buffering_admin);
-
+
//FUZZ: disable check_for_lack_ACE_OS
ACE_Time_Value sleep (0, 10000);
orb->run (sleep);
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index cd3fa337886..41cdea4cf1c 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/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/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index 6222cdd906f..18aa4d484dd 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/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[])
{
try
{
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 62ae3d6eb7a..ed8c241129b 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.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/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp
index 959e2f97c50..92779af5a85 100644
--- a/TAO/tests/Optimized_Connection/oc_client.cpp
+++ b/TAO/tests/Optimized_Connection/oc_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[])
{
try
{
diff --git a/TAO/tests/POA/Bug_1592_Regression/client.cpp b/TAO/tests/POA/Bug_1592_Regression/client.cpp
index 76e7f34222f..f3a7ae297db 100644
--- a/TAO/tests/POA/Bug_1592_Regression/client.cpp
+++ b/TAO/tests/POA/Bug_1592_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 status = 0;
diff --git a/TAO/tests/POA/Bug_1592_Regression/server.cpp b/TAO/tests/POA/Bug_1592_Regression/server.cpp
index aa073c2d452..1103a178804 100644
--- a/TAO/tests/POA/Bug_1592_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_1592_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
{
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
index 6b199cbf575..33896824787 100644
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp
@@ -144,7 +144,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int retval = 0;
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index 44ba7d209ff..ddbe1dbd3ad 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -23,7 +23,7 @@
#include "ace/Log_Msg.h"
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp
index 9f33c3b6f10..28ed3ab075a 100644
--- a/TAO/tests/POA/Deactivate_Object/server.cpp
+++ b/TAO/tests/POA/Deactivate_Object/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Hello,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index 9d5c7997022..751c1be5f0d 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -136,7 +136,7 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa)
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
index 7581d3ca796..7058c44fc35 100644
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ b/TAO/tests/POA/EndpointPolicy/client.cpp
@@ -39,7 +39,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::Object_var tmp;
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index 11cde64c52e..b4eb18a631f 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/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[])
{
CORBA::ORB_var orb;
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index f4fc6dd47c1..cf4af633240 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -104,7 +104,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 2dbf1e8d086..258fe8df03a 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -150,7 +150,7 @@ test_object_deactivation (PortableServer::POA_ptr poa,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 336816f9d29..4552ed0dab0 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -487,7 +487,7 @@ test_poas (CORBA::ORB_ptr orb,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index c60a1aa60ec..45432307937 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -228,7 +228,7 @@ overwrite_servant_manager (PortableServer::POA_ptr poa)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int retval = 0;
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index 531e9b29c1f..d6147687ab8 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -196,7 +196,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index cb48775e93b..542647856db 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -61,7 +61,7 @@ test_i::~test_i (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 4e2263a7404..21e26f61326 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -195,7 +195,7 @@ Deactivator::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
index be4f89f1607..084f59d62c0 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
@@ -68,7 +68,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/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index ddb6df170f7..0bb1f6e8c75 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -37,7 +37,7 @@ test_i::destroy_poa (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 4b22ec2ca25..b8ddb1d00ec 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -59,7 +59,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/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 3f947de960f..0b258be3056 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -209,7 +209,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/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 94d9fdba2c8..d1a228faa12 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -26,7 +26,7 @@
#include "ace/Log_Msg.h"
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index 8c0d26b8abc..acb7b8941ac 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -33,7 +33,7 @@ getRefCount (PortableServer::ServantBase * sb)
}
int
-main (int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index d3ec07ddcb5..6f39281ae31 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -110,7 +110,7 @@ Worker::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp
index 8835493c31a..6bef8ed251a 100644
--- a/TAO/tests/Parallel_Connect_Strategy/client.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/client.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/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp
index aae9f2a6bfc..39faf611818 100644
--- a/TAO/tests/Parallel_Connect_Strategy/server.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/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/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index 06176f9e302..2ef33f6fdcc 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -31,7 +31,7 @@ ACE_RCSID (Param_Test,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int n = 1024;
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 174a68185c1..b0ffb8f750f 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -28,7 +28,7 @@ ACE_RCSID (Param_Test,
// This function runs the test (main program)
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
// get an instance of the driver object
Driver drv;
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 784e2a7e120..59de4d8d5ff 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -57,7 +57,7 @@ parse_args (int argc, char *argv[])
// Standard command line parsing utilities used.
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
PortableServer::POA_var oa_ptr;
Param_Test_i *param_test = 0;
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index cf3e5176b71..f3741778a0d 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -319,7 +319,7 @@ test_forward (CORBA::ORB_ptr orb)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
ACE_DEBUG ((LM_DEBUG, "Running the Stub Tests.\n"));
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index eacc107b233..16333aba79b 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -80,7 +80,7 @@ private:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 4ad17b6ff66..36963ae5863 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -48,7 +48,7 @@ static void test_synchronous (Test::Echo_ptr echo);
static void test_ami (CORBA::ORB_ptr orb,
Test::Echo_ptr echo);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index 1806edc7ff5..ffd290f6116 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/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/tests/Portable_Interceptors/AdvSlot/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
index 0a9b7436bf1..9dde6c00f21 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
@@ -4,7 +4,7 @@
#include "StateTransferC.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index bec2fec98a8..2ff409e3400 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -149,7 +149,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ORBInitializer_var orb_initializer (new ORB_Initializer ());
register_orb_initializer (orb_initializer.in ());
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
index 8a959137c9a..ed27268f76e 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
@@ -19,7 +19,7 @@ namespace
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index adca9a99c0d..c955edb6f92 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -276,7 +276,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ORBInitializer_var orb_initializer (new ORB_Initializer ());
register_orb_initializer (orb_initializer.in ());
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
index 0a9b7436bf1..9dde6c00f21 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
@@ -4,7 +4,7 @@
#include "StateTransferC.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index 2904d579070..dd65ec67d69 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -192,7 +192,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ORBInitializer_var orb_initializer (new ORB_Initializer ());
register_orb_initializer (orb_initializer.in ());
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 87ddbdc29c1..34f4a371b54 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -149,7 +149,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server)
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/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index 7acf0d97e27..48f47d6f225 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/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[])
{
int interceptor_type;
get_interceptor_type (argc, argv, interceptor_type);
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index 201fa69579d..b737f4490c4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -67,7 +67,7 @@ run_test (Test_Interceptors::Visual_ptr server)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index eeaa08ec50f..c98b304e839 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/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/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
index 8c921e36401..2fc166203f6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -7,7 +7,7 @@
ACE_RCSID(Interceptors, client, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Client_ORBInitializer* initializer1 = 0;
Client_ORBInitializer* initializer2 = 0;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index a5f0db0817b..b2354197f86 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -53,7 +53,7 @@ static ACE_THR_FUNC_RETURN run_test(void* pData)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
index ba970ef032f..81b290a1d81 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_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
{
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 390c62e60d1..0f20609da93 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -39,7 +39,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/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
index e8a8fa5e368..75b1bd3fbb0 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
@@ -41,7 +41,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/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index d0d61b6ca92..a1ed805287b 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -85,7 +85,7 @@ run_test (Test_Interceptors::Visual_ptr server)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 0eb7f2af5ff..770bf89ecbf 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/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/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index b1e1b4a439f..6d21d79b42c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/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[])
{
int status = 0;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index f38e3a462f5..16aec8e7a84 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/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[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index 133e8e99a6f..2ad884815d3 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/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[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index 93559fb7899..dc845f895c2 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/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/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
index 770d8e4b86b..03752109574 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.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/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index 6b1ff730487..841c40a8d9b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/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/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index 4b08ee9fd3c..176e29366da 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.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/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index a19ef3514fb..903aacc264c 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.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/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 50181bc40e1..2ec075eee22 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (PolicyFactory,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
index f8d5a53b5cc..eaf29e27fac 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
@@ -52,7 +52,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/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
index 802548bb6d8..3b92bd034ba 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
@@ -40,7 +40,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/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
index 2c39f5bbd01..109855bbaa1 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
@@ -40,7 +40,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/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 8829cc5cb9d..3541d3d65d5 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(Recursive_ORBInitializer,
"$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Client_ORBInitializer* initializer1 = 0;
Client_ORBInitializer* initializer2 = 0;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
index 4dab792cc64..20b9ed99cc7 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/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[])
{
int status = 0;
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index b335e156a30..e2a2ff19f45 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -47,7 +47,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/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index fbf9c48da3e..ad99e8ca34f 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -95,7 +95,7 @@ int test_orb (CORBA::ORB_ptr orb)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
Server_ORBInitializer *initializer = 0;
int retval = 0;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 035b3959bd2..a56bf320a54 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -148,7 +148,7 @@ server_test (Test_ptr server)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 75b41080f27..0a620f91d8a 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.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/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index dbb602e2733..38d69731625 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -68,7 +68,7 @@ run_test (Test_Interceptors::Visual_ptr server)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index cd2707435f4..5e5a06d1d7f 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/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/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
index b7d2b320500..09a6d8f38cc 100644
--- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp
+++ b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
@@ -26,7 +26,7 @@ public:
};
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 0e647960cb1..e3a75ef1345 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(QtTests, client, "$Id$")
#include "client.h"
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
QApplication app (argc, argv);
TAO::QtResource_Loader qt_resources (&app);
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 99bd2ba6579..d92c8efca5a 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -47,7 +47,7 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
// We do the command line parsing first
if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index ac6b8e192bf..3ff6fbef8ff 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -264,7 +264,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index ec7e41a1014..67bc8f48434 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -314,7 +314,7 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 2c365f6af65..f62bca7f9b1 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -169,7 +169,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index e36f90b4c39..a7e0e43ec9c 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -224,7 +224,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index bfadacc151e..65fc14fc9d6 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -83,7 +83,7 @@ exception_test (Test_ptr server,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index b8c46953130..85b90c3395a 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -144,7 +144,7 @@ create_object (PortableServer::POA_ptr poa,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index 26ff0aab28f..8cb6db98521 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -788,7 +788,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index d934d699c75..9c6238dd403 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -83,7 +83,7 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 263c41e2701..4bda4c70332 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -161,7 +161,7 @@ toggle (int &i)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 191bdf7be4e..599625d2a9f 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -95,7 +95,7 @@ create_object (PortableServer::POA_ptr poa,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index bfe535ecc1e..2ce1d9a31ff 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -151,7 +151,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 555caae988f..edd3c90968c 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -290,7 +290,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 52b68e9e603..23a057d43e2 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -46,7 +46,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index 48d802e44a3..baf56ef5748 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -126,7 +126,7 @@ create_object (PortableServer::POA_ptr poa,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 7334600bc90..4651de66e3e 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -286,7 +286,7 @@ Task::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index a46b65c0cc3..0af6656e8f0 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -256,7 +256,7 @@ Task::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index 63fe5a5fb7d..db7b14d2889 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -276,7 +276,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index f3bb343db61..7e23e282be3 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -191,7 +191,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index b0f03a3e6a5..8727011c296 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -68,7 +68,7 @@ test_multiple_orbs (const char *test_name,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int iterations = 5;
int rt_orb = 0;
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index bfec3748b91..9df67ea9933 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/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[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index 98701515818..5730f6d5dd7 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -295,7 +295,7 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index bfbb1fb858c..94987dfcd8c 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -25,7 +25,7 @@
#include "ace/Log_Msg.h"
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index d0ebde5bd96..8ce4baa9218 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -123,7 +123,7 @@ Task::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 27609392a80..4e31c300dac 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -769,7 +769,7 @@ Task::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index 67a07eb73d7..3e7af1f9820 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -165,7 +165,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index 12d4e9b56a7..4a018b4245a 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -280,7 +280,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index a651beb4718..9287072242e 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -49,7 +49,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 43bf4272810..8106ec91a37 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -131,7 +131,7 @@ create_object (PortableServer::POA_ptr poa,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index bb32bad8d4e..19322c6e463 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -481,7 +481,7 @@ Task::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 39568f7685b..4d1da5311d6 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -352,7 +352,7 @@ Task::svc (void)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index d4be7a51006..be1c102350d 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -460,7 +460,7 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
#endif /* ACE_HAS_THREADS */
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 1c9e7b0ce44..8d1d8bcfeea 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -72,7 +72,7 @@ check_policy (Test_ptr server)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index a0e420e0171..ec8c50e5b47 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -294,7 +294,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index 2231c996369..65005cb6326 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/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/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index ff419a938b0..3492919b720 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -224,7 +224,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index d66cfdf2006..00533222a46 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -111,7 +111,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 816ea22446e..930c8ea1220 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -291,7 +291,7 @@ Task::svc (void)
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index c840d3937d0..eeb8f8a37d0 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -5,7 +5,7 @@
#include "tao/RTScheduling/RTScheduler_Manager.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index 32616d1aeb1..052723f99ed 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -7,7 +7,7 @@
#include "ace/SString.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb;
RTScheduling::Current_var current;
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 83f368dbc91..1ddaf1c7aba 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -36,7 +36,7 @@ parse_args (int argc,
#endif /* THREAD_CANCELLED */
int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb;
test_var server;
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 1d611ce19c8..6a70be0ac7f 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -76,7 +76,7 @@ parse_args (int argc,
}
int
-main (int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 3501ebf87f8..6b97b21f2c6 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -7,7 +7,7 @@
#include "tao/ORB_Core.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp
index c222feaef8c..0db77f05395 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -4,7 +4,7 @@
#include "test.h"
int
-main (int argc, char* argv [])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
CORBA::ORB_var orb;
try
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 0d6a8468674..b705b0d12ee 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -77,7 +77,7 @@ void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver);
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index 3bc0fe20fe1..992c5a581b0 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -35,7 +35,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/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 1dd1f8f000e..24e2a5b6110 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -89,7 +89,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/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index 8046a6f25bf..04c1e3e4548 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -70,7 +70,7 @@ Purging_Handler::handle_close (ACE_HANDLE h,
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
if (parse_args (argc, argv) == -1)
return -1;
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 3cc5badc07f..efd5c526956 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -28,7 +28,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/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index a0434811577..180dfe89096 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/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[])
{
try
{
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index c82291b31e3..17bfff5ff19 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.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/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp
index 9e1c21bb333..e83a6d5cb04 100644
--- a/TAO/tests/Server_Port_Zero/server.cpp
+++ b/TAO/tests/Server_Port_Zero/server.cpp
@@ -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/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 2e3fec470ae..7b19752c169 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -69,7 +69,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/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index 8746e3d7178..4c5b9d8c8de 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -35,7 +35,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/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 4a31a251065..7d71aff0a4c 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -96,7 +96,7 @@ 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/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index b6ac65282b8..86d593179bf 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -93,7 +93,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/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
index 572b80866fd..b4434445054 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/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/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index e7ae1b339a5..697eacf1da5 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -90,7 +90,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/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index e2b02924fcc..e1c14c4b39e 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -96,7 +96,7 @@ return 0;
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 06e90e45600..0105ae5685e 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -90,7 +90,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/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index d92fa486932..8775fce783a 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
int status = 0;
try
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 967b1986579..b08cdf47477 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -90,7 +90,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/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index b9c1df0563d..2dceda6460f 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/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[])
{
try
{
diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp
index 48b7f6c363a..a9eed06345a 100644
--- a/TAO/tests/Stack_Recursion/server.cpp
+++ b/TAO/tests/Stack_Recursion/server.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/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index 8a2b7e467f1..3f1d07c87fa 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -62,7 +62,7 @@ Client::Client ()
}
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
{
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index f80e008049c..b2b5b5ffc8a 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.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/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 90b0076ff77..2c2ca877252 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -171,7 +171,7 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object)
}
int
-main (int argc, char **argv)
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
try
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 35ef40177d5..95a0a22a9a7 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -35,7 +35,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/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 92196824db9..3aac50dee20 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.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/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 6221c47dcc3..8ebd53cdea5 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -79,7 +79,7 @@ testCurrentLoader (int, char *[])
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
return testCurrentLoader (argc, argv)
|| testCurrentORBInitializer (argc, argv);
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index acc17c83f94..4d90109d0da 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/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[])
{
// Used to declare the CORBA::Environment variable
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 34fdb2a1686..94be58e476e 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -55,7 +55,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/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index b023ceec937..27afab2e003 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/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/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index de731d5cc49..757a528b7d0 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.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/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index 54f076b147e..39fa190d4d0 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.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/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 381367d80fc..54061fb9671 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -187,7 +187,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/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 90804389553..82900f7aba8 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Xt_Stopwatch, client, "$Id$")
int
-main (int argc, char *argv[])
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
XtAppContext app;
Widget toplevel = XtAppInitialize (&app,
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index c421d2d5f88..140d46ed889 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/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[])
{
// We do the command line parsing first
if (parse_args (argc, argv) != 0)