1 files changed, 8 insertions, 15 deletions
diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h
index 89ba35c6220..7cc09f4974b 100644
--- a/ace/Argv_Type_Converter.h
+++ b/ace/Argv_Type_Converter.h
@@ -22,7 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_Argv_Type_Converter
@@ -42,15 +41,16 @@ public:
 
   ACE_Argv_Type_Converter (int &argc, char** argv);
 
-#if defined (ACE_USES_WCHAR)
   ACE_Argv_Type_Converter (int &argc, wchar_t** argv);
-#endif  // ACE_USES_WCHAR
 
   ~ACE_Argv_Type_Converter (void);
 
   /// Returns the pointer of converted command line.
   ACE_TCHAR** get_TCHAR_argv (void);
 
+  /// Returns the pointer of converted command line.
+  wchar_t** get_Wide_argv (void);
+
   /// Returns the pointer of ASCII (char) command line.
   char** get_ASCII_argv (void);
 
@@ -65,8 +65,6 @@ private:
   /// Assignment '=' operator should not be used.
   ACE_Argv_Type_Converter operator= (const ACE_Argv_Type_Converter&);
 
-#if defined (ACE_USES_WCHAR)
-
   /// Perform common initialization for two Ctor's.
   void initialize (void);
 
@@ -80,17 +78,15 @@ private:
 
   /// Clean up removed (comsumed) argv entries and reset the pass flags.
   void cleanup (void);
-#endif  // ACE_USES_WCHAR
 
 private:
   /// Original number of input paramter, same as 'argc'.
   int &saved_argc_;
 
-  /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR.
+  /// Data member pointer that contains converted argv in char.
   char** char_argv_;
 
-#if defined (ACE_USES_WCHAR)
-  /// Data member pointer that contains converted argv in ACE_TCHAR.
+  /// Data member pointer that contains converted argv in wchar_t.
   wchar_t** wchar_argv_;
 
   /// argc value before any argv has been passed.
@@ -98,18 +94,15 @@ private:
 
   /// FALSE represents original argv passed in is char, and TRUE
   /// represents wchar_t.
-  const int original_type_;
+  const bool original_type_wchar_;
 
   /// TRUE indicates wchar_t type argv has been passed.
-  int wchar_passed_;
+  bool wchar_passed_;
 
   /// TRUE indicates char type argv has been passed.
-  int char_passed_;
-#endif  /* ACE_USES_WCHAR */
+  bool char_passed_;
 };
 
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
 #include "ace/Argv_Type_Converter.inl"
 #endif  /* __ACE_INLINE__ */