diff options
Diffstat (limited to 'ace/Argv_Type_Converter.inl')
| -rw-r--r-- | ace/Argv_Type_Converter.inl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ace/Argv_Type_Converter.inl b/ace/Argv_Type_Converter.inl index f56c83146b3..54b9ed2dfc1 100644 --- a/ace/Argv_Type_Converter.inl +++ b/ace/Argv_Type_Converter.inl @@ -8,6 +8,15 @@ ACE_INLINE ACE_TCHAR** ACE_Argv_Type_Converter::get_TCHAR_argv (void) { #if defined (ACE_USES_WCHAR) + return get_Wide_argv (); +#else + return get_ASCII_argv (); +#endif +} + +ACE_INLINE wchar_t** +ACE_Argv_Type_Converter::get_Wide_argv (void) +{ if (this->char_passed_) { this->align_wchar_with_char (); @@ -15,22 +24,17 @@ ACE_Argv_Type_Converter::get_TCHAR_argv (void) this->wchar_passed_ = true; return this->wchar_argv_; -#else - return this->char_argv_; -#endif // ACE_USES_WCHAR } ACE_INLINE char** ACE_Argv_Type_Converter::get_ASCII_argv (void) { -#if defined (ACE_USES_WCHAR) if (this->wchar_passed_) { this->align_char_with_wchar (); } - this->char_passed_ = 1; -#endif // ACE_USES_WCHAR + this->char_passed_ = true; return this->char_argv_; } |