diff options
32 files changed, 107 insertions, 27 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 309f3c68627..c229641e7d9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,44 @@ +Wed Feb 27 15:21:48 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * orbsvcs/Naming_Service/NT_Naming_Server.cpp: + * orbsvcs/Notify_Service/NT_Notify_Server.cpp: + * orbsvcs/examples/CosEC/Simple/Consumer.cpp: + * orbsvcs/examples/CosEC/Simple/Service.cpp: + * orbsvcs/examples/CosEC/Simple/Supplier.cpp: + * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp: + * orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp: + * orbsvcs/examples/ImR/Combined_Service/test.cpp: + * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp: + * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp: + * orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp: + * orbsvcs/examples/RtEC/IIOPGateway/EC.cpp: + * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp: + * orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp: + * orbsvcs/examples/RtEC/Kokyu/Service.cpp: + * orbsvcs/examples/RtEC/MCast/MCast.cpp: + * orbsvcs/examples/RtEC/Schedule/Service.cpp: + * orbsvcs/examples/RtEC/Simple/Consumer.cpp: + * orbsvcs/examples/RtEC/Simple/Service.cpp: + * orbsvcs/examples/RtEC/Simple/Supplier.cpp: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp: + * orbsvcs/tests/Redundant_Naming/client.cpp: + * orbsvcs/tests/Sched/DynSched_Test.cpp: + + Use ACE_TMAIN instead of main as the program entry point to comply + with ACE/TAO/CIAO coding standards. + + * orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc: + * orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc: + * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc: + * orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc: + * orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc: + * orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc: + * orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc: + * orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc: + + MPC doesn't recognize ACE_TMAIN as an entry point, as such, we need + to explicitly set exename in the MPC file. + Wed Feb 27 08:36:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/GIOP_Message_Generator_Parser_12.cpp: diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index 64dbeb96fc7..3675d0fdaf5 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -27,7 +27,7 @@ #include "ace/Log_Msg.h" int -main (int, char*[]) +ACE_TMAIN(int, ACE_TCHAR *[]) { ACE_ERROR ((LM_INFO, "This program is only supported " diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp index 90ce225d6e1..48ae3e772fe 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp @@ -28,7 +28,7 @@ #include "ace/Log_Msg.h" int -main (int, char*[]) +ACE_TMAIN(int, ACE_TCHAR *[]) { ACE_ERROR ((LM_INFO, "This program is only supported " diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 1a600a91e0f..3ec1581f3de 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -8,7 +8,7 @@ ACE_RCSID (CosEC_Examples, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Consumer consumer; diff --git a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc index 7a91454ad07..9537776ef03 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc +++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc @@ -2,18 +2,27 @@ // $Id$ project(*Service) : orbsvcsexe, event, event_serv, naming { + + exename = Service + Source_Files { Service.cpp } } project(*Consumer) : orbsvcsexe, event, event_skel { + + exename = Consumer + Source_Files { Consumer.cpp } } project(*Supplier) : orbsvcsexe, event, event_skel { + + exename = Supplier + Source_Files { Supplier.cpp } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index 7217f16ee8a..d15a2af735a 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "ec.ior"; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_CEC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 03a0c13e02a..c39ad862e31 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -9,7 +9,7 @@ ACE_RCSID (CosEC_Examples, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Supplier supplier; diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index f11dc27dbee..545183495d2 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -10,7 +10,7 @@ ACE_RCSID (CosEC_Examples, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc index cddcd128801..22056c72cb8 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc @@ -2,6 +2,8 @@ // $Id$ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { + exename = Consumer + requires += ec_typed_events source_files { Consumer.cpp @@ -10,6 +12,8 @@ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { } project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { + exename = Supplier + requires += ec_typed_events after += CosEC_TypedSimple_Consumer idl_files { diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index a51632e9a07..98f7088d0cc 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -7,7 +7,7 @@ ACE_RCSID(CosEC_Examples, Supplier, "$Id:") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc index 482fcc7a42e..eecde8c04b7 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc @@ -32,6 +32,7 @@ project(*Controller) : orbsvcsexe { // A client that uses corba to test out basic imr functionality project(*Test) : orbsvcsexe { + exename = test after += *IDL source_files { test.cpp @@ -43,6 +44,7 @@ project(*Test) : orbsvcsexe { // A server to use with the imr project(*TestServer) : orbsvcsexe, portableserver, iortable, avoids_corba_e_micro { + exename = test_server after += *IDL // The gnuace specific portion is to prevent invalid object files from // IDL generated files being compiled simultaneously with parallel builds. diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp index b74936e8804..feb64b55592 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp @@ -20,7 +20,7 @@ using namespace CORBA; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index f5ba3f77ca2..c7ceb01cafc 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -74,7 +74,7 @@ public: if (ACE_OS::thr_create (&tracker_thunk, this, THR_JOINABLE, - &thread_) != 0) + &thread_) != 0) ACE_OS::abort (); } @@ -198,7 +198,7 @@ private: }; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index 498ce553efd..343da42b2ad 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -33,7 +33,7 @@ using namespace CosNotification; using namespace CosNotifyChannelAdmin; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 9c2c1d2ffef..972181383dc 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -18,7 +18,7 @@ const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Consumer consumer; diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index 2831f1b3a23..6f3009c2350 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -16,7 +16,7 @@ ACE_RCSID (EC_Examples, static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { EC channel; diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 8a6e88ed107..abda8735f78 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -17,7 +17,7 @@ static const char* supplierec = 0; static const char* consumerec = 0; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Gateway gateway; diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc index 2ece2c2a38d..2671b2a5ed7 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc @@ -2,6 +2,9 @@ // $Id$ project(*Consumer): messaging, rteventexe, naming { + + exename = Consumer + requires += corba_messaging Source_Files { @@ -10,6 +13,9 @@ project(*Consumer): messaging, rteventexe, naming { } project(*Supplier): messaging, rteventexe, naming { + + exename = Supplier + requires += corba_messaging Source_Files { @@ -18,6 +24,9 @@ project(*Supplier): messaging, rteventexe, naming { } project(*): messaging, rteventexe, rtevent_serv, naming { + + exename = Gateway + requires += corba_messaging Source_Files { @@ -26,6 +35,9 @@ project(*): messaging, rteventexe, rtevent_serv, naming { } project(*EC): messaging, rteventexe, rtevent_serv, naming { + + exename = EC + requires += corba_messaging Source_Files { diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index f016dbfff30..9e2cf6558cd 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -19,7 +19,7 @@ const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; static const char* ecname = 0; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Supplier supplier; diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc index 88d36ead38f..79b652f0621 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc @@ -1,3 +1,4 @@ // $Id$ project: orbsvcsexe, rtkokyuevent, rtevent_serv { + exename = Service } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index cd73298bbde..9654858f777 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -42,10 +42,10 @@ typedef TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_M typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_MUF_SCHED_TYPE; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_UNUSED_ARG (config_run); - + //TAO_EC_Default_Factory::init_svcs (); TAO_EC_Kokyu_Factory::init_svcs (); diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 6f7fc2bebab..af1e33adb86 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -25,7 +25,7 @@ const char *udp_mcast_address = int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { // Register the default factory in the Service Configurator. // If your platform supports static constructors then you can diff --git a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc index ebe69a8ddbc..ec419f3bb13 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc +++ b/TAO/orbsvcs/examples/RtEC/MCast/RtEC_MCast.mpc @@ -2,4 +2,5 @@ // $Id$ project : orbsvcsexe, rtevent_serv, rtsched { + exename = MCast } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc index ebe69a8ddbc..f28dd9330a4 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc +++ b/TAO/orbsvcs/examples/RtEC/Schedule/RtEC_Schedule.mpc @@ -2,4 +2,5 @@ // $Id$ project : orbsvcsexe, rtevent_serv, rtsched { + exename = Service } diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 6b788914137..961d7db4a12 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -25,7 +25,7 @@ int parse_args (int argc, char *argv[]); typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index 5203f82a466..1e554a81916 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -10,7 +10,7 @@ ACE_RCSID (EC_Examples, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Consumer consumer; diff --git a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc index b98ff0f88e4..0982c19dbc0 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc +++ b/TAO/orbsvcs/examples/RtEC/Simple/RtEC_Simple.mpc @@ -2,18 +2,27 @@ // $Id$ project(*Service) : orbsvcsexe, rtevent_serv, naming { + + exename = Service + source_files { Service.cpp } } project(*Supplier) : orbsvcsexe, rtevent_skel, naming { + + exename = Supplier + source_files { Supplier.cpp } } project(*Consumer) : orbsvcsexe, rtevent_skel, naming { + + exename = Consumer + source_files { Consumer.cpp } diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 997078045e7..291313352b7 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -15,7 +15,7 @@ const char *ior_output_file = "ec.ior"; int parse_args (int argc, char *argv[]); int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 56b0a8063cc..4e26cbf4ba7 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -11,7 +11,7 @@ ACE_RCSID (EC_Examples, "$Id$") int -main (int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Supplier supplier; diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index e3f86094dee..f263b2011c3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -278,7 +278,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) #else int -main (int, char *[]) +ACE_TMAIN(int, ACE_TCHAR *[]) { return 0; } diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index e2bc46925d8..263084c4d5f 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -79,7 +79,7 @@ My_Test_Object::id (CORBA::Short id) // This function runs the test. int -main (int argc, ACE_TCHAR **argv) +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int c_breath = 4; int c_depth = 4; diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index b711f653685..b0567d8321c 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -6,8 +6,8 @@ # include <quantify.h> #endif /* ACE_HAS_QUANTIFY */ -ACE_RCSID (Sched, - DynSched_Test, +ACE_RCSID (Sched, + DynSched_Test, "$Id$") // period times, in 100 nanoseconds @@ -258,7 +258,7 @@ DynSched_Test::run_schedule (ACE_Scheduler_Strategy &strategy, } int -main (int, char *[]) +ACE_TMAIN(int, ACE_TCHAR *[]) { int result = 0; |