diff options
| author | cleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-18 22:48:26 +0000 |
|---|---|---|
| committer | cleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-18 22:48:26 +0000 |
| commit | 4165bce73fc23d677dd345f4676f2113927f2759 (patch) | |
| tree | a8435e6ff6015f924e734e4610bfb15340e995ac /TAO/tao/default_resource.cpp | |
| parent | 01ff07853296faf1ce7a8143f093866c1a49d4dd (diff) | |
| download | ATCD-4165bce73fc23d677dd345f4676f2113927f2759.tar.gz | |
Two changes: one experimental for changing the allocator, another to fix
compilation problems in single-threaded platforms.
Diffstat (limited to 'TAO/tao/default_resource.cpp')
| -rw-r--r-- | TAO/tao/default_resource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 8c759dac768..ceedcbead61 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -785,8 +785,12 @@ TAO_Default_Resource_Factory::reclaim_reactor (ACE_Reactor *reactor) typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; +#if TAO_USE_LOCAL_MEMORY_POOL typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; +#else +typedef ACE_New_Allocator LOCKED_ALLOCATOR; +#endif ACE_Allocator * TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void) |