diff options
-rw-r--r-- | TAO/ChangeLog-98c | 2 | ||||
-rw-r--r-- | TAO/tao/default_server.cpp | 2 |
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) { |