ChangeLogTag: Fri Sep 30 08:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 14 insertions, 19 deletions

diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index c691b88b513..46b22d831b5 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -632,7 +632,7 @@ FE_init (void)
 
   // Put an empty prefix on the stack for the global scope.
   idl_global->pragma_prefixes ().push (ACE::strnew (""));
-  
+
 #ifdef ACE_LACKS_MKSTEMP
   /// Initialise the UUID Generator
   ACE_Utils::UUID_GENERATOR::instance ()->init ();
@@ -688,8 +688,8 @@ FE_populate (void)
 void
 FE_store_env_include_paths (void)
 {
-  ACE_Env_Value<char*> incl_paths ("INCLUDE",
-                                   (char *) 0);
+  ACE_Env_Value<char*> incl_paths (ACE_TEXT ("INCLUDE"),
+                                   (ACE_TCHAR *) 0);
   const char *aggr_str = incl_paths;
 
   if (aggr_str != 0)
@@ -718,8 +718,8 @@ FE_get_cpp_loc_from_env (void)
   const char *cpp_loc = 0;
 
   // See if TAO_IDL_PREPROCESSOR is defined.
-  ACE_Env_Value<char*> preprocessor ("TAO_IDL_PREPROCESSOR",
-                                     (char *) 0);
+  ACE_Env_Value<char*> preprocessor (ACE_TEXT ("TAO_IDL_PREPROCESSOR"),
+                                     (ACE_TCHAR *) 0);
 
   // Set cpp_loc to the built in location, unless it has been overriden by
   // environment variables.
@@ -730,8 +730,8 @@ FE_get_cpp_loc_from_env (void)
   else
     {
       // Check for the deprecated CPP_LOCATION environment variable
-      ACE_Env_Value<char*> cpp_path ("CPP_LOCATION",
-                                     (char *) 0);
+      ACE_Env_Value<char*> cpp_path (ACE_TEXT ("CPP_LOCATION"),
+                                     (ACE_TCHAR *) 0);
 
       if (cpp_path != 0)
         {
@@ -748,7 +748,7 @@ FE_get_cpp_loc_from_env (void)
           cpp_loc = idl_global->cpp_location ();
         }
     }
-    
+
   return cpp_loc;
 }
 
@@ -756,10 +756,10 @@ const char *
 FE_get_cpp_args_from_env (void)
 {
   const char *cpp_args = 0;
-  
+
   // Added some customizable preprocessor options
-  ACE_Env_Value<char*> args1 ("TAO_IDL_PREPROCESSOR_ARGS",
-                              (char *) 0);
+  ACE_Env_Value<char*> args1 (ACE_TEXT ("TAO_IDL_PREPROCESSOR_ARGS"),
+                              (ACE_TCHAR *) 0);
 
   if (args1 != 0)
     {
@@ -769,8 +769,8 @@ 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",
-                                  (char *) 0);
+      ACE_Env_Value<char*> args2 (ACE_TEXT ("TAO_IDL_DEFAULT_CPP_FLAGS"),
+                                  (ACE_TCHAR *) 0);
 
       if (args2 != 0)
         {
@@ -784,12 +784,7 @@ FE_get_cpp_args_from_env (void)
           cpp_args = args2;
         }
     }
-    
+
   return cpp_args;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Env_Value<char*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Env_Value<char*>
-#endif