diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-06 18:21:57 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-06 18:21:57 +0000 |
| commit | f92db3b44e66acbe0b8ebdfd1d560bb56ef57a80 (patch) | |
| tree | 9aef0d6910d5b804f092b923a90f5a0505a46169 /TAO/tao/Strategies/advanced_resource.cpp | |
| parent | bce56f7636d05633a4f2706261f5f6e05b274353 (diff) | |
| download | ATCD-f92db3b44e66acbe0b8ebdfd1d560bb56ef57a80.tar.gz | |
ChangeLogTag: Thu Apr 6 18:18:47 UTC 2006 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/tao/Strategies/advanced_resource.cpp')
| -rw-r--r-- | TAO/tao/Strategies/advanced_resource.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 18378302d4d..dc6c0a5886f 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -691,9 +691,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; -typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; -typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; - ACE_Allocator * TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void) { @@ -724,12 +721,9 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void) NULL_LOCK_ALLOCATOR, 0); break; - case TAO_ALLOCATOR_THREAD_LOCK: default: - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR, - 0); - break; + return + this->TAO_Default_Resource_Factory::input_cdr_buffer_allocator(); } return allocator; } |