summaryrefslogtreecommitdiff
path: root/TAO/tests/Bug_1627_Regression/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/Bug_1627_Regression/server.cpp
parent1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff)
downloadATCD-d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e.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/Bug_1627_Regression/server.cpp')
-rw-r--r--TAO/tests/Bug_1627_Regression/server.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index 63308e1c36c..213bcede6ac 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -3,6 +3,7 @@
//
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
#include "Test_i.h"
#include "tao/IORTable/IORTable.h"
@@ -12,7 +13,7 @@ const char *object_key = 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)
@@ -35,14 +36,16 @@ 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, "" 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 =
@@ -62,7 +65,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;
Test_i server_impl;
@@ -91,7 +94,7 @@ main (int argc, char *argv[])
adapter->bind("Name-with-hyphens", ior.in());
- FILE *output_file= ACE_OS::fopen ("server.ior", "w");
+ FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w"));
if (output_file == 0)
ACE_ERROR_RETURN ((LM_ERROR,
"SERVER (%P): Cannot open output file "