summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-03-02 08:48:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-03-02 08:48:46 +0000
commit18c17c4c261f8f2a01a22e37d6bf8acd0efec303 (patch)
tree00263a857ea182b3ce7b94a2318f192ce88434b6
parent755d0228aa3e24fca36f6b0aaca9bb74b9a11f72 (diff)
downloadATCD-18c17c4c261f8f2a01a22e37d6bf8acd0efec303.tar.gz
ChangeLogTag: Thu Mar 2 08:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>Wed Mar 1 19:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
index 22433ffa8b7..3c2858f541e 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
@@ -550,10 +550,10 @@ CIAO::Container_Impl::register_with_ns (const char * s,
char * naming_string = tmp.rep ();
char seps[] = "/:";
- char *token, *lastToken = NULL;
+ char *token, *lastToken = 0;
token = ACE_OS::strtok (naming_string, seps);
- for (CORBA::ULong i = 0; token != NULL; ++i)
+ for (CORBA::ULong i = 0; token != 0; ++i)
{
// While there still are tokens in the "naming_string"
name.length (name.length () + 1);
@@ -561,7 +561,7 @@ CIAO::Container_Impl::register_with_ns (const char * s,
// Get next naming context
lastToken = token;
- token = ACE_OS::strtok ( NULL, seps );
+ token = ACE_OS::strtok ( 0, seps );
}
if (name.length() > 1)
@@ -626,10 +626,10 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
char * naming_string = tmp.rep ();
char seps[] = "/:";
- char *token, *lastToken = NULL;
+ char *token, *lastToken = 0;
token = ACE_OS::strtok (naming_string, seps);
- for (CORBA::ULong i = 0; token != NULL; ++i)
+ for (CORBA::ULong i = 0; token != 0; ++i)
{
// While there still are tokens in the "naming_string"
name.length (name.length () + 1);
@@ -637,7 +637,7 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
// Get next naming context
lastToken = token;
- token = ACE_OS::strtok ( NULL, seps );
+ token = ACE_OS::strtok ( 0, seps );
}
// Unregister with the Name Server