CE stuff.

1 files changed, 14 insertions, 14 deletions

diff --git a/ace/ARGV.h b/ace/ARGV.h
index d64263ec960..f7b1a854f52 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -29,14 +29,14 @@ class ACE_Export ACE_ARGV
   //     environment variable substitutions if necessary.
 public:
   // = Initialization and termination.
-  ACE_ARGV (const char buf[], int substitute_env_args = 1);
+  ACE_ARGV (const ASYS_TCHAR buf[], int substitute_env_args = 1);
   // Converts <buf> into an <argv>-style vector of strings.  If
   // <substitute_env_args> is enabled then we'll substitute the
   // environment variables for each $ENV encountered in the string.
   // The subscript and argv() operations are not allowed on an
   // ACE_ARGV created this way.
 
-  ACE_ARGV (char *argv[], int substitute_env_args = 1);
+  ACE_ARGV (ASYS_TCHAR *argv[], int substitute_env_args = 1);
   // Converts <argv> into a linear string.  If <substitute_env_args>
   // is enabled then we'll substitute the environment variables for
   // each $ENV encountered in the string.
@@ -44,7 +44,7 @@ public:
   // this way.
 
   ACE_ARGV (int substitute_env_args = 1);
-  // Entry point for creating an char *[] command line iteratively
+  // Entry point for creating an ASYS_TCHAR *[] command line iteratively
   // via the add() method.  The argv() and buf() method calls are
   // allowed, and the result is recreated when called multiple times.
   // The subscript operator is not allowed.
@@ -53,10 +53,10 @@ public:
   // Destructor.
 
   // = Accessor arguments.
-  const char *operator[] (size_t index);
+  const ASYS_TCHAR *operator[] (size_t index);
   // Returns the <index>th string in the ARGV array.  
 
-  char **argv (void);
+  ASYS_TCHAR **argv (void);
   // Returns the <argv> array.  Caller should not delete this memory
   // since the <ARGV> destructor will delete it.  If the caller modifies
   // the array in the iterative mode, the changes are not saved to the
@@ -65,7 +65,7 @@ public:
   size_t argc (void) const;
   // Returns <argc>. 
 
-  const char *buf (void);
+  const ASYS_TCHAR *buf (void);
   // Returns the <buf>.  Caller should not delete this memory since
   // the <ARGV> destructor will delete it.
 
@@ -75,7 +75,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  int add (const char *next_arg);
+  int add (const ASYS_TCHAR *next_arg);
   // Add another argument.  This only works in the ITERATIVE state.
 
   int state (void) const;
@@ -85,11 +85,11 @@ public:
   enum States 
   {
     TO_STRING = 1,    
-    // ACE_ARGV converts buf[] to char *argv[]
+    // ACE_ARGV converts buf[] to ASYS_TCHAR *argv[]
     TO_PTR_ARRAY = 2, 
-    // ACE_ARGV converts char *argv[] to buf[]
+    // ACE_ARGV converts ASYS_TCHAR *argv[] to buf[]
     ITERATIVE = 3    
-    // Builds buf[] or char *argv[] iteratively with add()
+    // Builds buf[] or ASYS_TCHAR *argv[] iteratively with add()
   };
 
 private:
@@ -98,7 +98,7 @@ private:
   // Creates buf_ from the queue, deletes previous buf_.
 
   void string_to_array (void);
-  // Converts buf_ into the char *argv[] format.
+  // Converts buf_ into the ASYS_TCHAR *argv[] format.
 
   int substitute_env_args_;
   // Replace args with environment variable values?
@@ -109,17 +109,17 @@ private:
   size_t argc_;
   // Number of arguments in the ARGV array. 
 
-  char **argv_;
+  ASYS_TCHAR **argv_;
   // The array of string arguments. 
 
-  char *buf_;
+  ASYS_TCHAR *buf_;
   // Buffer containing the <argv> contents.
 
   size_t length_;
   // Total length of the arguments in the queue, not counting
   // separating spaces
 
-  ACE_Unbounded_Queue<char *> queue_;
+  ACE_Unbounded_Queue<ASYS_TCHAR *> queue_;
   // Queue which keeps user supplied arguments.  This is only
   // active in the "iterative" mode.
 };