diff options
Diffstat (limited to 'TAO/orbsvcs/tests/InterfaceRepo/Latency_Test')
3 files changed, 12 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index c29daa4ff2a..33d5a850b02 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -3,6 +3,7 @@ #include "Latency_Query_Client.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/Sample_History.h" @@ -30,14 +31,12 @@ Latency_Query_Client::init (int argc, { ACE_TRY_NEW_ENV { - this->orb_ = CORBA::ORB_init (argc, - argv, + this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int retval = this->parse_args (argc, - argv); + int retval = this->parse_args (argc, argv); if (retval != 0) { @@ -137,7 +136,7 @@ Latency_Query_Client::run (void) if (this->do_dump_history_) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -162,10 +161,9 @@ Latency_Query_Client::run (void) } int -Latency_Query_Client::parse_args (int argc, - char *argv[]) +Latency_Query_Client::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "dhi:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "dhi:"); int c; int result = 0; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc index f2cf973217a..243b151c51f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc @@ -1,4 +1,5 @@ // $Id$ project: ifr_client { + exename = client avoids += ace_for_tao } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 43c9155ebb1..6364ca7811f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -2,18 +2,20 @@ // $Id$ #include "Latency_Query_Client.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Latency__Test, client, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + Latency_Query_Client client; - int retval = client.init (argc, - argv); + int retval = client.init (convert.get_argc(), convert.get_ASCII_argv()); if (retval == -1) { |