diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-14 04:24:34 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-14 04:24:34 +0000 |
| commit | a75c149af7ad0324ef2a41750b54f8665da558a5 (patch) | |
| tree | 81cee7daa0dd54ebc952efa37d3c24227debc979 /TAO/tao/CDR.cpp | |
| parent | bd1719144c32060fb372c01dddd85f591b0829bc (diff) | |
| download | ATCD-a75c149af7ad0324ef2a41750b54f8665da558a5.tar.gz | |
ChangeLogTag:Tue Oct 13 23:03:24 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/CDR.cpp')
| -rw-r--r-- | TAO/tao/CDR.cpp | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 8cfc0d127ef..656dc0d111b 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -580,18 +580,8 @@ 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, - 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), + TAO_Marshal_Factory *factory) + : start_ (buf, bufsiz), factory_ (factory), do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER), good_bit_ (1) @@ -601,19 +591,8 @@ TAO_InputCDR::TAO_InputCDR (const char *buf, size_t bufsiz, TAO_InputCDR::TAO_InputCDR (size_t bufsiz, int byte_order, - 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), + TAO_Marshal_Factory *factory) + : start_ (bufsiz), factory_ (factory), do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER), good_bit_ (1) @@ -632,6 +611,16 @@ TAO_InputCDR::TAO_InputCDR (ACE_Message_Block *data, this->start_.wr_ptr (data->wr_ptr ()); } +TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data, + int byte_order, + TAO_Marshal_Factory *factory) + : start_ (data), + factory_ (factory), + do_byte_swap_ (byte_order != TAO_ENCAP_BYTE_ORDER), + good_bit_ (1) +{ +} + TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs, size_t size, CORBA::Long offset) |