diff options
Diffstat (limited to 'TAO/interop-tests/wchar/server.cpp')
| -rw-r--r-- | TAO/interop-tests/wchar/server.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp index cb325b47325..e0830b030b1 100644 --- a/TAO/interop-tests/wchar/server.cpp +++ b/TAO/interop-tests/wchar/server.cpp @@ -19,6 +19,9 @@ #include "interop_wchar_i.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" +#if defined (TAO_EXPLICIT_NEGOTIATE_CODESETS) +#include "tao/Codeset/Codeset.h" +#endif /* TAO_EXPLICIT_NEGOTIATE_CODESETS */ const ACE_TCHAR *ior_output_file = ACE_TEXT("IOR"); int verbose = 0; @@ -58,13 +61,6 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) { ACE_Argv_Type_Converter command_line(argc, argv); - if (parse_args(command_line.get_argc(), command_line.get_TCHAR_argv())) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("failed to parse args")), - 1); - } - #if (!defined ACE_HAS_WCHAR) && (!defined ACE_HAS_XPG4_MULTIBYTE_CHAR) // the run_test script looks for the ior file. By touching it here, the // script can run at full speed, rather than timing out waiting for a @@ -83,7 +79,16 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) try { // Initialize orb - CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() ); + CORBA::ORB_var orb = + CORBA::ORB_init( command_line.get_argc(), + command_line.get_ASCII_argv() ); + if (parse_args(command_line.get_argc(), + command_line.get_TCHAR_argv())) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("failed to parse args")), + 1); + } //Get reference to Root POA CORBA::Object_var obj = |