summaryrefslogtreecommitdiff
path: root/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp')
-rw-r--r--TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index a91cf021548..92c607cbf00 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -1,6 +1,7 @@
// -*- C++ -*-
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "test_i.h"
#include "FOO_IORInterceptor_ORBInitializer.h"
@@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior";
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)
@@ -40,8 +41,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);
+
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
@@ -61,8 +64,8 @@ main (int argc, char *argv[])
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- CORBA::ORB_var orb = CORBA::ORB_init (argc,
- argv,
+ CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+ convert.get_ASCII_argv(),
"test_orb"
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -88,7 +91,7 @@ main (int argc, char *argv[])
poa_manager->activate (ACE_ENV_SINGLE_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 server_impl (orb.in ());
@@ -115,7 +118,7 @@ main (int argc, char *argv[])
// If the ior_output_file exists, output the IOR to it.
if (ior_output_file != 0)
{
- FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+ FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
"Cannot open output file for writing "