diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-30 06:29:08 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-30 06:29:08 +0000 |
| commit | 3e14ff8ac10b468d0db9e3aeb911194d994a4f26 (patch) | |
| tree | 43c81594fa0d782562c89d2e4f1a7f1bb492948c /TAO/tao/CDR.cpp | |
| parent | a77cd81afe23a24e83f82adfa5c47e42217d9116 (diff) | |
| download | ATCD-3e14ff8ac10b468d0db9e3aeb911194d994a4f26.tar.gz | |
ChangeLogTag:Wed Sep 30 00:26:44 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/CDR.cpp')
| -rw-r--r-- | TAO/tao/CDR.cpp | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 30a03c0105d..8cfc0d127ef 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -244,12 +244,12 @@ TAO_OutputCDR::grow_and_adjust (size_t size, size_t align, char*& buf) ACE_Message_Block (block_size, ACE_Message_Block::MB_DATA, 0, 0, - orb_core->cdr_buffer_allocator (), + orb_core->output_cdr_buffer_allocator (), 0, 0, ACE_Time_Value::zero, ACE_Time_Value::max_time, - orb_core->data_block_allocator ()), + orb_core->output_cdr_dblock_allocator ()), -1); this->good_bit_ = 1; @@ -580,8 +580,18 @@ TAO_OutputCDR::write_boolean_array (const CORBA::Boolean* x, TAO_InputCDR::TAO_InputCDR (const char *buf, size_t bufsiz, int byte_order, - TAO_Marshal_Factory *factory) - : start_ (buf, bufsiz), + TAO_Marshal_Factory *factory, + ACE_Allocator* buffer_allocator, + ACE_Allocator* data_block_allocator) + : start_ (bufsiz, + ACE_Message_Block::MB_DATA, + 0, + buf, + buffer_allocator, + 0, 0, + ACE_Time_Value::zero, + ACE_Time_Value::max_time, + data_block_allocator), factory_ (factory), do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER), good_bit_ (1) @@ -591,8 +601,19 @@ TAO_InputCDR::TAO_InputCDR (const char *buf, size_t bufsiz, TAO_InputCDR::TAO_InputCDR (size_t bufsiz, int byte_order, - TAO_Marshal_Factory *factory) - : start_ (bufsiz), + TAO_Marshal_Factory *factory, + ACE_Allocator* buffer_allocator, + ACE_Allocator* data_block_allocator) + : start_ (bufsiz, + ACE_Message_Block::MB_DATA, + 0, + 0, + buffer_allocator, + 0, + 0, + ACE_Time_Value::zero, + ACE_Time_Value::max_time, + data_block_allocator), factory_ (factory), do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER), good_bit_ (1) @@ -685,8 +706,19 @@ TAO_InputCDR::operator= (const TAO_InputCDR& rhs) return *this; } -TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs) - : start_ (rhs.total_length () + CDR::MAX_ALIGNMENT), +TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, + ACE_Allocator* buffer_allocator, + ACE_Allocator* data_block_allocator) + : start_ (rhs.total_length () + CDR::MAX_ALIGNMENT, + ACE_Message_Block::MB_DATA, + 0, + 0, + buffer_allocator, + 0, + 0, + ACE_Time_Value::zero, + ACE_Time_Value::max_time, + data_block_allocator), factory_ (rhs.factory_), do_byte_swap_ (rhs.do_byte_swap_), good_bit_ (1) |