summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-11-12 05:19:41 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-11-12 05:19:41 +0000
commit0b10f40aa19e59bf0aae0b9ef626c209849aac9f (patch)
tree3d2dbf1f2bbfb6392310eb5ff0887dd7ad5bbd9c
parent7d3f173483b4763a0fcb2a3c8c3020f24fdf2a82 (diff)
downloadATCD-0b10f40aa19e59bf0aae0b9ef626c209849aac9f.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-98c2
-rw-r--r--TAO/tao/default_server.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index db071d2d0d0..ca8cec10d94 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,7 @@
Tue Nov 11 20:45:26 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+ * tao/default_server.cpp (parse_args): Replaced NULL with 0.
+
* tao/corbacom.h: Fixed the macro for TAO_SYSTEM_EXCEPTION so
compilers don't whine about extra semi-colons.
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index ec45e5ff68e..8a7fdcf8d78 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -149,7 +149,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
{
curarg++;
if (curarg < argc)
- this->object_table_size_ = ACE_OS::strtoul (argv[curarg], NULL, 10);
+ this->object_table_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
}
else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
{