diff options
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/utils/nslist/nsadd.cpp | 4 | ||||
| -rw-r--r-- | TAO/utils/nslist/nsdel.cpp | 6 | ||||
| -rw-r--r-- | TAO/utils/nslist/nslist.cpp | 6 |
4 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 113e115d79c..e957b571759 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Oct 23 06:43:14 UTC 2008 Vladimir Zykov <vzykov@prismtech.com> + + * utils/nslist/nsdel.cpp: + * utils/nslist/nsadd.cpp: + * utils/nslist/nslist.cpp: + + Fixed compile errors on wchar builds. I wonder how wchar build + on windows accepted my changes before. + Wed Oct 22 17:37:26 UTC 2008 Simon McQueen <sm@prismtech.com> * tao/Bounded_Sequence_CDR_T.h: diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp index 86d72eb8afb..265aff18561 100644 --- a/TAO/utils/nslist/nsadd.cpp +++ b/TAO/utils/nslist/nsadd.cpp @@ -237,9 +237,9 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) if (kind) { *kind = '\0'; - the_name[index].kind= CORBA::string_dup (++kind); + the_name[index].kind= CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(++kind)); } - the_name[index].id = CORBA::string_dup (cp); + the_name[index].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(cp)); name = 0; // way strtok works } diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp index 241b9ad1eb0..9f6fdae2315 100644 --- a/TAO/utils/nslist/nsdel.cpp +++ b/TAO/utils/nslist/nsdel.cpp @@ -114,7 +114,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) failed= true; } else - nameService = ACE_TEXT_ALWAYS_CHAR (*argv); + nameService = *argv; } } else if (0 == ACE_OS::strcmp (*argv, ACE_TEXT ("--quiet"))) @@ -254,9 +254,9 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) if (kind) { *kind = '\0'; - the_name[index].kind= CORBA::string_dup (++kind); + the_name[index].kind= CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(++kind)); } - the_name[index].id = CORBA::string_dup (cp); + the_name[index].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(cp)); name = 0; // way strtok works } diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp index f337d57cdcc..0fbe467f7f0 100644 --- a/TAO/utils/nslist/nslist.cpp +++ b/TAO/utils/nslist/nslist.cpp @@ -411,7 +411,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) failed = true; } else - nameService = ACE_TEXT_ALWAYS_CHAR (*argv); + nameService = *argv; } } else if (0 == ACE_OS::strcmp (*argv, ACE_TEXT ("--nsior"))) @@ -689,9 +689,9 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[]) if (kind) { *kind = '\0'; - the_name[index].kind= CORBA::string_dup (++kind); + the_name[index].kind= CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(++kind)); } - the_name[index].id = CORBA::string_dup (cp); + the_name[index].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(cp)); name = 0; // way strtok works } |