summaryrefslogtreecommitdiff
path: root/TAO/tests/Explicit_Event_Loop/server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Explicit_Event_Loop/server.cpp')
-rw-r--r--TAO/tests/Explicit_Event_Loop/server.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 498c465ec22..c7c60d65c57 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -24,6 +24,7 @@
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
const char *ior_output_file = "server.ior";
int done = 0;
@@ -31,7 +32,7 @@ int done = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:d");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
int c;
while ((c = get_opts ()) != -1)
@@ -83,19 +84,21 @@ void do_something_else()
}
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
{
// Initialize orb
- 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;
}
@@ -136,7 +139,7 @@ main (int argc, char *argv[])
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)
{