diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-09 18:12:56 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-09 18:12:56 +0000 |
| commit | a7aa907624fbbeb42bf2e7e26db0037c0f50eafd (patch) | |
| tree | 36a5f483c22702cfc01786e4d63cdd18d780a023 | |
| parent | f1a6167c8037d70fa6114cf6ca1f3e3a39d604d8 (diff) | |
| download | ATCD-a7aa907624fbbeb42bf2e7e26db0037c0f50eafd.tar.gz | |
ChangeLogTag:Thu Aug 9 11:10:59 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index aa17331a314..1b3b91af2a4 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu Aug 9 11:10:59 2001 Ossama Othman <ossama@uci.edu> + + * tao/default_resource.cpp: + + Temporarily reverted previous change. The default resource + factory is still destroyed before the ORB core is destroyed. + Another solution is needed. + Thu Aug 9 11:46:27 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/CDR.h: Fixed the ambigous constructor problem. The InputCDR diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index a322fd2f718..4228be56b9b 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -935,14 +935,14 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, ACE_SVC_OBJ_T, &ACE_SVC_NAME (TAO_Default_Resource_Factory), ACE_Service_Type::DELETE_THIS - /* | ACE_Service_Type::DELETE_OBJ */ /* SEE ABOVE */, + | ACE_Service_Type::DELETE_OBJ /* | ACE_Service_Type::DELETE_OBJ */ /* SEE ABOVE */, 0) // @@ See below for an explanation of why this macro is not used for // the TAO_Default_Resource_Factory. -// ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory) - +ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory) +#if 0 // A custom factory definition is used instead of the commonly used // one created by the ACE_FACTORY_DEFINE macro below. This is // necessary to get around dynamic unloading issues. The default @@ -977,6 +977,7 @@ _make_TAO_Default_Resource_Factory (ACE_Service_Object_Exterminator *gobbler) return rf; } +#endif /* 0 */ // **************************************************************** |