summaryrefslogtreecommitdiff
path: root/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
diff options
context:
space:
mode:
authorjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-08 23:00:05 +0000
committerjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-08 23:00:05 +0000
commitd1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch)
treecf04398acb7ad9fb45311eb105d60975028bbc03 /TAO/tests/Portable_Interceptors/PICurrent/server.cpp
parent1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff)
downloadATCD-oci_wchar_refactor_post_1_5_1_branch.tar.gz
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'TAO/tests/Portable_Interceptors/PICurrent/server.cpp')
-rw-r--r--TAO/tests/Portable_Interceptors/PICurrent/server.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 3e0b650480f..8c0943196de 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -1,6 +1,7 @@
// -*- C++ -*-
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "test_i.h"
#include "ServerORBInitializer.h"
@@ -20,7 +21,7 @@ extern PortableInterceptor::SlotId slot_id;
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)
@@ -43,8 +44,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[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- 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;
obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
@@ -130,7 +133,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 "