diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf')
6 files changed, 8 insertions, 19 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index b68487ba367..b18f6af0567 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -23,7 +23,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -71,7 +71,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index ed3756bffbe..b3e4d91970b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -22,7 +22,7 @@ int num_threads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -236,7 +236,7 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am index fe64ba1e763..c9e53f44635 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am @@ -22,7 +22,6 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA BUILT_SOURCES = \ @@ -55,11 +54,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) @touch $@ -noinst_HEADERS = \ - Test.idl - endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -67,7 +62,6 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -107,7 +101,6 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -115,7 +108,6 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING -if !BUILD_ACE_FOR_TAO if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -160,7 +152,6 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_MINIMUM_CORBA -endif !BUILD_ACE_FOR_TAO endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h index 1e85d70efd2..86f905dd6cd 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h @@ -30,9 +30,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_LB_LoadAlert; -TAO_END_VERSIONED_NAMESPACE_DECL /** * @class ServerRequestInterceptor diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index 94221caa7bd..77552424f3b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -23,7 +23,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -72,7 +72,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/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index f6ce3d00373..8b4fce4c59a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -26,7 +26,7 @@ const char * strategy = "Random"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -239,7 +239,7 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) |