diff options
| author | sergio <sergio@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-22 09:53:54 +0000 |
|---|---|---|
| committer | sergio <sergio@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-22 09:53:54 +0000 |
| commit | a4c32383ea65a15b08c6ebf13a08fd2c2b0e6b2f (patch) | |
| tree | 21b114f2506d9bce38d588ebfbdd82dc6b881023 | |
| parent | a025445ca1c9d49dd7eaee5bfa45c195d1d32a85 (diff) | |
| download | ATCD-a4c32383ea65a15b08c6ebf13a08fd2c2b0e6b2f.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 32821146eda..90f713c551c 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,8 @@ +Sun Mar 22 03:52:39 1998 Sergio Flores <sergio@lambada.cs.wustl.edu> + + * tao/TAO_Internal.cpp (open_services): "this" may only be used + inside a nonstatic member function. + Sun Mar 22 02:58:29 1998 Nanbor Wang <nanbor@cs.wustl.edu> * tao/Makefile: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 3d6243686c6..2cf4c055c09 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -334,7 +334,7 @@ TAO_ORB_Core::init (int& argc, char** argv) delete [] svc_config_argv; // check for errors returned from TAO_Internal::open_services() - if (result == -1) + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "ORB Core unable to initialize the Service Configurator"), diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 9ab5711e9ec..7c5b9364911 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -63,7 +63,7 @@ TAO_Internal::open_services (int& argc, char** argv) #if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - return this->fake_service_entries_i (); + return fake_service_entries_i (); #else return ACE_Service_Config::open (argc, argv); #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */ |