diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-18 16:19:59 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-18 16:19:59 +0000 |
| commit | f61e3a4439c4b7c7912ae7cacad821ef0404e18d (patch) | |
| tree | fddcdf282fa1b2c7aeeb16657704993afc6d9fb7 | |
| parent | 5a30d0e61be15a86a78871107905aa2c8ac1d904 (diff) | |
| download | ATCD-f61e3a4439c4b7c7912ae7cacad821ef0404e18d.tar.gz | |
ChangeLogTag:Fri Jun 18 11:19:01 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index fa82f21f327..e285c005e94 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Fri Jun 18 11:19:01 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/ORB_Core.cpp: + Put the output CDR alllocators in TSS storage *all* the time. + Fri Jun 18 10:07:09 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * examples/POA/Adapter_Activator/server.cpp: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 303f3e69bb4..1632265a18d 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1451,7 +1451,9 @@ TAO_ORB_Core::input_cdr_buffer_allocator (void) ACE_Allocator* TAO_ORB_Core::output_cdr_dblock_allocator (void) { +#if 0 if (this->use_tss_resources_) +#endif /* 0 */ { TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources (); @@ -1463,6 +1465,7 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void) return tss->output_cdr_buffer_allocator_; } +#if 0 if (this->orb_resources_.output_cdr_buffer_allocator_ == 0) { // Double checked locking @@ -1475,12 +1478,15 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void) } } return this->orb_resources_.output_cdr_buffer_allocator_; +#endif /* 0 */ } ACE_Allocator* TAO_ORB_Core::output_cdr_buffer_allocator (void) { +#if 0 if (this->use_tss_resources_) +#endif /* 0 */ { TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources (); @@ -1492,6 +1498,7 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void) return tss->output_cdr_buffer_allocator_; } +#if 0 if (this->orb_resources_.output_cdr_buffer_allocator_ == 0) { // Double checked locking @@ -1504,6 +1511,7 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void) } } return this->orb_resources_.output_cdr_buffer_allocator_; +#endif /* 0 */ } ACE_Data_Block* |