diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-04-10 19:03:11 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-04-10 19:03:11 +0000 |
| commit | 9cde40d0c48adfc59c02d2027b103a482297e5c8 (patch) | |
| tree | f11e1c66673bfc57d5b4268bd075bee75dbec45c | |
| parent | a439985f34c1c878783bfb75100fa541d32530b0 (diff) | |
| download | ATCD-9cde40d0c48adfc59c02d2027b103a482297e5c8.tar.gz | |
.
| -rw-r--r-- | ChangeLog-99b | 6 | ||||
| -rw-r--r-- | TAO/tao/Object_Adapter.cpp | 21 | ||||
| -rw-r--r-- | ace/Malloc.cpp | 10 | ||||
| -rw-r--r-- | ace/Malloc_Base.h | 3 |
4 files changed, 23 insertions, 17 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index a7a53f84f85..fe3ef53fcf2 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,9 @@ +Sat Apr 10 14:02:11 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Malloc[_Base]: Added a new no-op constructor for + ACE_Allocator to hopefully work around a problem with DEC UNIX + C++. + Fri Apr 09 10:08:49 1999 David L. Levine <levine@cs.wustl.edu> * include/makeinclude/platform_vxworks5.x_g++.GNU: diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp index f646dcce57e..e5a9820ad8c 100644 --- a/TAO/tao/Object_Adapter.cpp +++ b/TAO/tao/Object_Adapter.cpp @@ -342,23 +342,14 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name, TAO_POA *&poa) { int result = 0; + if (root) - { - poa = this->orb_core_.root_poa (); - } + poa = this->orb_core_.root_poa (); else - { - result = this->transient_poa_map_->find (system_name, - poa); - } - - if (result == 0) - { - if (poa->creation_time () != poa_creation_time) - { - result = -1; - } - } + result = this->transient_poa_map_->find (system_name, + poa); + if (result == 0 && poa->creation_time () != poa_creation_time) + result = -1; return result; } diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp index 5caa47c8b48..21111301edc 100644 --- a/ace/Malloc.cpp +++ b/ace/Malloc.cpp @@ -140,12 +140,13 @@ ACE_Allocator::close_singleton (void) { ACE_TRACE ("ACE_Allocator::close_singleton"); - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, + ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Static_Object_Lock::instance ())); if (ACE_Allocator::delete_allocator_) { - // This should never be executed. See ACE_Allocator::instance (void). + // This should never be executed.... See the + // ACE_Allocator::instance (void) method for an explanation. delete ACE_Allocator::allocator_; ACE_Allocator::allocator_ = 0; ACE_Allocator::delete_allocator_ = 0; @@ -157,6 +158,11 @@ ACE_Allocator::~ACE_Allocator (void) ACE_TRACE ("ACE_Allocator::~ACE_Allocator"); } +ACE_Allocator::ACE_Allocator (void) +{ + ACE_TRACE ("ACE_Allocator::ACE_Allocator"); +} + void ACE_Static_Allocator_Base::dump (void) const { diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h index ff7dac57a08..f2a40868cd2 100644 --- a/ace/Malloc_Base.h +++ b/ace/Malloc_Base.h @@ -38,6 +38,9 @@ public: static void close_singleton (void); // Delete the dynamically allocated Singleton + ACE_Allocator (void); + // "No-op" constructor (needed to make certain compilers happy). + virtual ~ACE_Allocator (void); // Virtual destructor |