summaryrefslogtreecommitdiff
path: root/TAO/tests/Smart_Proxies/dtor/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Smart_Proxies/dtor/server.cpp')
-rw-r--r--TAO/tests/Smart_Proxies/dtor/server.cpp15
1 files changed, 9 insertions, 6 deletions
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,