diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-10-22 01:26:12 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-10-22 01:26:12 +0000 |
| commit | 5ff307cf57ee9675faca8baeef1b5a577e2f2193 (patch) | |
| tree | d45c2a0a86d9bd247f65494b0d8c395e330f4d2b /ace | |
| parent | 861aac3f11e42e45f82647f5bd44f733798559a9 (diff) | |
| download | ATCD-5ff307cf57ee9675faca8baeef1b5a577e2f2193.tar.gz | |
ChangeLogTag:Thu Oct 21 20:21:13 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Memory_Pool.cpp | 1 | ||||
| -rw-r--r-- | ace/Svc_Handler.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 80f1dae763d..0add7887a8a 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -271,6 +271,7 @@ ACE_MMAP_Memory_Pool::map_file (off_t map_size) else { #if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) + this->base_addr_ = this->mmap_.addr (); ACE_BASED_POINTER_REPOSITORY::instance ()->bind (this->base_addr_, map_size); #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp index 95f7027aee7..767a4a71fba 100644 --- a/ace/Svc_Handler.cpp +++ b/ace/Svc_Handler.cpp @@ -159,10 +159,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown (void) this->reactor ()->cancel_timer (this); if (this->peer ().get_handle () != ACE_INVALID_HANDLE) - { - // Remove self from reactor. - this->reactor ()->remove_handler (this, mask); - } + // Remove self from reactor. + this->reactor ()->remove_handler (this, mask); } // Remove self from the recycler. |