diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-09 17:36:43 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-09 17:36:43 +0000 |
| commit | 70225ea9dcbf9efe3a1584cf49eacd99e2f6b6ea (patch) | |
| tree | 665890b58d515c5215416cc30504be73eae1cc2a | |
| parent | 76d9b45785cf96166bf1381dfe6ca5135894e201 (diff) | |
| download | ATCD-70225ea9dcbf9efe3a1584cf49eacd99e2f6b6ea.tar.gz | |
Reverted Carlos's changes
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 20 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.h | 5 |
2 files changed, 3 insertions, 22 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 7b148bfc68c..aca2792a85b 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1415,7 +1415,6 @@ TAO_Resource_Factory::input_cdr_dblock_allocator (void) ACE_NEW_RETURN (GLOBAL_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_, GBL_ALLOCATOR, 0); - GLOBAL_APP_ALLOCATED::instance ()->own_input_cdr_dblock_allocator_ = 1; } return GLOBAL_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_; ACE_NOTREACHED (break); @@ -1425,7 +1424,6 @@ TAO_Resource_Factory::input_cdr_dblock_allocator (void) ACE_NEW_RETURN (TSS_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_, TSS_ALLOCATOR, 0); - TSS_APP_ALLOCATED::instance ()->own_input_cdr_dblock_allocator_ = 1; } return TSS_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_; ACE_NOTREACHED (break); @@ -1444,7 +1442,6 @@ TAO_Resource_Factory::input_cdr_buffer_allocator (void) ACE_NEW_RETURN (GLOBAL_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_, GBL_ALLOCATOR, 0); - GLOBAL_APP_ALLOCATED::instance ()->own_input_cdr_buffer_allocator_ = 1; } return GLOBAL_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_; case TAO_TSS: @@ -1453,7 +1450,6 @@ TAO_Resource_Factory::input_cdr_buffer_allocator (void) ACE_NEW_RETURN (TSS_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_, TSS_ALLOCATOR, 0); - TSS_APP_ALLOCATED::instance ()->own_input_cdr_buffer_allocator_ = 1; } return TSS_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_; } @@ -1482,24 +1478,14 @@ TAO_Resource_Factory::App_Allocated::App_Allocated (void) poa_(0), alloc_(0), input_cdr_dblock_allocator_ (0), - input_cdr_buffer_allocator_ (0), - own_input_cdr_dblock_allocator_ (0), - own_input_cdr_buffer_allocator_ (0) + input_cdr_buffer_allocator_ (0) { } TAO_Resource_Factory::App_Allocated::~App_Allocated (void) { - if (this->own_input_cdr_dblock_allocator_) - { - delete this->input_cdr_dblock_allocator_; - this->own_input_cdr_dblock_allocator_ = 0; - } - if (this->own_input_cdr_buffer_allocator_) - { - delete this->input_cdr_buffer_allocator_; - this->own_input_cdr_buffer_allocator_ = 0; - } + delete this->input_cdr_dblock_allocator_; + delete this->input_cdr_buffer_allocator_; } TAO_Resource_Factory::Pre_Allocated::~Pre_Allocated (void) diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 1532b7e9ffc..00efa3c8270 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -613,11 +613,6 @@ public: ACE_Allocator *input_cdr_dblock_allocator_; ACE_Allocator *input_cdr_buffer_allocator_; // The allocators for the input CDR streams. - - int own_input_cdr_dblock_allocator_; - int own_input_cdr_buffer_allocator_; - // Set to true if the class should destroy the CDR allocators. - // If the allocators are global then it shouldn't }; protected: |