summaryrefslogtreecommitdiff
path: root/TAO/utils/nslist
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/utils/nslist')
-rw-r--r--TAO/utils/nslist/nsadd.cpp4
-rw-r--r--TAO/utils/nslist/nsdel.cpp2
-rw-r--r--TAO/utils/nslist/nslist.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index 1394726c5d2..f69511d3d0a 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -104,7 +104,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
CORBA::Object_var obj;
if (ior)
{
- obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior) ACE_ENV_ARG_PARAMETER);
+ obj = orb->string_to_object (ACE_TEXT_TO_CHAR_IN (ior) ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -122,7 +122,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
return 1;
}
char buf[BUFSIZ];
- ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name));
+ ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN (name));
char *bp = &buf[0];
char *cp = 0;
int ntoks = 0;
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 48add17f564..886ce591fb8 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -84,7 +84,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
// make a copy
char buf[BUFSIZ];
- ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name));
+ ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN (name));
char *bp = &buf[0];
char *cp = 0;
int ntoks = 0;
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 80dabc861b4..d305fee2971 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -117,7 +117,7 @@ show_chunk (CosNaming::NamingContext_ptr nc,
"",
bl[i].binding_name[0].id.in ()));
- if (ACE_OS::strlen (bl[i].binding_name[0].kind) > 0)
+ if (ACE_OS::strlen (bl[i].binding_name[0].kind.in()) > 0)
ACE_DEBUG ((LM_DEBUG,
"(%s)",
bl[i].binding_name[0].kind.in ()));