summaryrefslogtreecommitdiff
path: root/TAO/tests/Smart_Proxies
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Smart_Proxies')
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/client.cpp15
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/server.cpp15
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/main.cpp7
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/client.cpp13
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/server.cpp15
-rw-r--r--TAO/tests/Smart_Proxies/Policy/client.cpp13
-rw-r--r--TAO/tests/Smart_Proxies/Policy/server.cpp15
-rw-r--r--TAO/tests/Smart_Proxies/client.cpp13
-rw-r--r--TAO/tests/Smart_Proxies/dtor/client.cpp13
-rw-r--r--TAO/tests/Smart_Proxies/dtor/server.cpp15
-rw-r--r--TAO/tests/Smart_Proxies/server.cpp15
11 files changed, 91 insertions, 58 deletions
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 34732cdac90..9be492b2cf3 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -25,6 +25,7 @@
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID (Benchmark,
client,
@@ -47,7 +48,7 @@ class Marker
ACE_UINT32 gsf)
{
// Print stats
- this->throughput_.dump_results (msg, gsf);
+ this->throughput_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf);
}
void sample (ACE_hrtime_t throughput_diff,
ACE_hrtime_t latency_diff)
@@ -66,7 +67,7 @@ class Marker
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "i:n:r:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:n:r:");
int c;
while ((c = get_opts ()) != -1)
@@ -95,8 +96,10 @@ parse_args (int argc, char *argv[])
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+ ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -120,13 +123,13 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
CORBA::Object_var object =
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index ca2acbcbec2..53416a8fc49 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -19,6 +19,7 @@
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Benchmark, server, "$Id$")
@@ -76,7 +77,7 @@ static const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -99,17 +100,19 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -145,7 +148,7 @@ main (int argc, char *argv[])
if (ior_output_file != 0)
{
FILE *output_file =
- ACE_OS::fopen (ior_output_file, "w");
+ ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index dff11cb451f..d0b32c908a6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -2,16 +2,19 @@
#include "Coll_Tester.h"
#include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Collocation, main, "$Id$")
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
Collocation_Test coll_test;
ACE_TRY_NEW_ENV
{
- coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
+ coll_test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
index 2ba4e74ca80..953737c9b28 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
@@ -20,6 +20,7 @@
#include "ace/Get_Opt.h"
#include "testC.h"
#include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Smart_Proxy, client, "$Id$")
@@ -28,7 +29,7 @@ const char *ior = "file://test.ior";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "i:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
int c;
while ((c = get_opts ()) != -1)
@@ -51,18 +52,20 @@ parse_args (int argc, char *argv[])
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
CORBA::Object_var object =
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index 5f0ebde1ffa..ba4cf4591d8 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -19,6 +19,7 @@
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Smart_Proxy, server, "$Id$")
@@ -74,7 +75,7 @@ static const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -97,17 +98,19 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -143,7 +146,7 @@ main (int argc, char *argv[])
if (ior_output_file != 0)
{
FILE *output_file =
- ACE_OS::fopen (ior_output_file, "w");
+ ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index a54fa3856f3..04331a0df03 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -20,6 +20,7 @@
#include "ace/OS_NS_string.h"
#include "testC.h"
#include "Smart_Proxy_Impl.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Smart_Proxy, client, "$Id$")
@@ -30,7 +31,7 @@ int one_shot_factory = 1;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "i:j:f:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:j:f:");
int c;
while ((c = get_opts ()) != -1)
@@ -105,18 +106,20 @@ return 0;
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
// To use the smart proxy it is necessary to allocate the
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 7e000c323d3..aa32dd1a5b3 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -19,6 +19,7 @@
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Smart_Proxy, server, "$Id$")
@@ -74,7 +75,7 @@ static const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -97,17 +98,19 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -143,7 +146,7 @@ main (int argc, char *argv[])
if (ior_output_file != 0)
{
FILE *output_file =
- ACE_OS::fopen (ior_output_file, "w");
+ ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 74b28effab2..312191a87f5 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -21,6 +21,7 @@
#include "Smart_Proxy_Impl.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Smart_Proxy, client, "$Id$")
@@ -29,7 +30,7 @@ const char *ior = "file://test.ior";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "i:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
int c;
while ((c = get_opts ()) != -1)
@@ -52,18 +53,20 @@ parse_args (int argc, char *argv[])
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
CORBA::ORB_var orb =
- CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
CORBA::Object_var object =
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 47c2c88884b..73afdac32dc 100644
--- a/TAO/tests/Smart_Proxies/dtor/client.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/client.cpp
@@ -3,6 +3,7 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "testC.h"
#include "Smart_Proxy_Impl.h"
@@ -12,7 +13,7 @@ bool dtor_called;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "i:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
int c;
while ((c = get_opts ()) != -1)
@@ -33,17 +34,19 @@ parse_args (int argc, char *argv[])
return 0;
}
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
CORBA::Object_var obj = orb->string_to_object (ior
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index fa9eadf988b..d37451d330e 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -3,6 +3,7 @@
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
class Test_i: public virtual POA_Test
{
@@ -45,7 +46,7 @@ static const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -67,19 +68,21 @@ parse_args (int argc, char *argv[])
return 0;
}
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
// Obtain RootPOA.
@@ -120,7 +123,7 @@ int main (int argc, char* argv[])
if (ior_output_file != 0)
{
FILE *output_file =
- ACE_OS::fopen (ior_output_file, "w");
+ ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 0fc44b24f0f..1e8efa70908 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -19,6 +19,7 @@
#include "testS.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(Smart_Proxy, server, "$Id$")
@@ -74,7 +75,7 @@ static const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -97,19 +98,21 @@ parse_args (int argc, char *argv[])
}
int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
""
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if (parse_args (argc, argv) != 0)
+ if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
return 1;
Test_i servant (orb.in ());
@@ -143,7 +146,7 @@ main (int argc, char *argv[])
if (ior_output_file != 0)
{
FILE *output_file =
- ACE_OS::fopen (ior_output_file, "w");
+ ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
View Lorry Controller Status