ChangeLogTag: Tue Jun 10 14:16:00 UTC 2008 Simon Massey <sma at prismtech dot com>

3 files changed, 9 insertions, 7 deletions

diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 93bb67b25f1..03ce41f5c9e 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -152,8 +152,8 @@ DRV_cpp_expand_output_arg (const char *filename)
                      + 1]);
 
       ACE_OS::sprintf (const_cast<ACE_TCHAR *> (DRV_arglist[output_arg_index]),
-                       output_arg_format,
-                       filename);
+                       ACE_TEXT_CHAR_TO_TCHAR (output_arg_format),
+                       ACE_TEXT_CHAR_TO_TCHAR (filename));
     }
 }
 
@@ -1046,7 +1046,7 @@ DRV_pre_proc (const char *myfile)
 
   FILE * const file = ACE_OS::fopen (myfile, "r");
   DRV_copy_input (file,
-                  ACE_OS::fdopen (ti_fd, "w"),
+                  ACE_OS::fdopen (ti_fd, ACE_TEXT("w")),
                   tmp_ifile,
                   myfile);
   ACE_OS::fclose (file);
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index d5d9de6b84c..ec697fc20eb 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -775,7 +775,7 @@ FE_get_cpp_args_from_env (void)
     {
       // Check for the deprecated TAO_IDL_DEFAULT_CPP_FLAGS environment
       // variable.
-      ACE_Env_Value<char*> args2 ("TAO_IDL_DEFAULT_CPP_FLAGS",
+      ACE_Env_Value<char*> args2 (ACE_TEXT ("TAO_IDL_DEFAULT_CPP_FLAGS"),
                                   (char *) 0);
 
       if (args2 != 0)
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index 416eb9760f9..fa762b565dc 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -74,6 +74,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_identifier.h"
 #include "drv_extern.h"
 #include "tao/Version.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 // FUZZ: disable check_for_streams_include
@@ -300,17 +301,18 @@ DRV_drive (const char *s)
 */
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter atc (argc, argv);
   try
     {
-      if (0 != DRV_init (argc, argv))
+      if (0 != DRV_init (atc.get_argc (), atc.get_ASCII_argv ()))
         {
           throw Bailout ();
         }
 
       // Parse arguments.
-      DRV_parse_args (argc, argv);
+      DRV_parse_args (atc.get_argc (), atc.get_ASCII_argv ());
 
       // If a version message is requested, print it and exit cleanly.
       if (idl_global->compile_flags () & IDL_CF_VERSION)