diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 11:15:26 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 11:15:26 +0000 |
| commit | b38582354ed287367fd93be229ae5e9dbf9188e7 (patch) | |
| tree | 9a2cd7fff6f9e796968703bf3bb2cb7ca5c5bf82 /ace/Argv_Type_Converter.cpp | |
| parent | 6a0568c32aa670b9d9c216c18ae796749c816819 (diff) | |
| download | ATCD-b38582354ed287367fd93be229ae5e9dbf9188e7.tar.gz | |
ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'ace/Argv_Type_Converter.cpp')
| -rw-r--r-- | ace/Argv_Type_Converter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp index 23ea5dd90ef..8d96ee77659 100644 --- a/ace/Argv_Type_Converter.cpp +++ b/ace/Argv_Type_Converter.cpp @@ -10,7 +10,7 @@ ACE_RCSID (ace, Argv_Type_Converter, "$Id$") -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" #if defined (ACE_USES_WCHAR) @@ -28,7 +28,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, wchar_t** argv) for (int i = 0; i < argc; ++i) { this->char_argv_[i] = - ACE_OS_String::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i])); + ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i])); } } #endif // ACE_USES_WCHAR @@ -49,7 +49,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter(int &argc, char** argv) for (int i = 0; i < argc; ++i) { this->wchar_argv_[i] = - ACE_OS_String::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i])); + ACE_OS::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i])); } } #else @@ -117,14 +117,14 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) while (wchar_argv_index < this->saved_argc_) { // if n'th entries of both argv lists are different - if (ACE_OS_String::strcmp(this->char_argv_[wchar_argv_index], + if (ACE_OS::strcmp(this->char_argv_[wchar_argv_index], ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0) { // loop through the wchar argv list entries that are after // wchar_argv_index for (int i = wchar_argv_index + 1; i < before_pass_argc_; ++i) { - if (ACE_OS_String::strcmp (this->char_argv_[i], + if (ACE_OS::strcmp (this->char_argv_[i], ACE_TEXT_ALWAYS_CHAR (match_argv)) == 0) { @@ -153,7 +153,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) while (char_argv_index < saved_argc_) { // if n'th entries of both argv lists are different - if (ACE_OS_String::strcmp ( + if (ACE_OS::strcmp ( ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]), match_argv) != 0) { @@ -161,7 +161,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) // wchar_argv_index for (int i = char_argv_index + 1; i < this->before_pass_argc_; ++i) { - if (ACE_OS_String::strcmp ( + if (ACE_OS::strcmp ( ACE_TEXT_ALWAYS_CHAR(this->wchar_argv_[i]), match_argv) == 0) { // swap the pointers in the char argv list |