summaryrefslogtreecommitdiff
path: root/TAO/tests/AMI_Buffering/admin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/AMI_Buffering/admin.cpp')
-rw-r--r--TAO/tests/AMI_Buffering/admin.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 9c883a1d3f5..4d5dd7deb5a 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -3,6 +3,7 @@
#include "AMI_Buffering_Admin.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
ACE_RCSID(AMI_Buffering, admin, "$Id$")
@@ -11,7 +12,8 @@ const char *ior_output_file = "admin.ior";
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:");
+ ACE_Argv_Type_Converter convert (argc, argv);
+ ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:");
int c;
while ((c = get_opts ()) != -1)
@@ -35,12 +37,14 @@ 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, "" ACE_ENV_ARG_PARAMETER);
+ CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
@@ -60,7 +64,7 @@ main (int argc, char *argv[])
root_poa->the_POAManager (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;
AMI_Buffering_Admin *AMI_buffering_admin_impl;
@@ -78,7 +82,7 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
- 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 IOR: %s",