diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-17 19:20:22 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-17 19:20:22 +0000 |
| commit | ca47b62638ba32880c10ba99bc26b1eac1ead53b (patch) | |
| tree | 6616e14474133bbadfe41fcc97bd4451d9ef8e60 /TAO/tao/CDR.cpp | |
| parent | 395b1bd18a2b8d927bcc3eb15da9c18ca16da966 (diff) | |
| download | ATCD-ca47b62638ba32880c10ba99bc26b1eac1ead53b.tar.gz | |
ChangeLog: Thu May 17 12:19:24 2001 Priyanka Gontla <pgontla@ece.uci.edu>
Diffstat (limited to 'TAO/tao/CDR.cpp')
| -rw-r--r-- | TAO/tao/CDR.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index a6ca2469147..890b563eb9d 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -76,6 +76,7 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size, int byte_order, ACE_Allocator *buffer_allocator, ACE_Allocator *data_block_allocator, + ACE_Allocator* message_block_allocator, size_t memcpy_tradeoff, ACE_Char_Codeset_Translator *char_translator, ACE_WChar_Codeset_Translator *wchar_translator) @@ -83,6 +84,7 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size, byte_order, buffer_allocator, data_block_allocator, + message_block_allocator, memcpy_tradeoff) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER); @@ -95,6 +97,7 @@ TAO_OutputCDR::TAO_OutputCDR (char *data, int byte_order, ACE_Allocator *buffer_allocator, ACE_Allocator *data_block_allocator, + ACE_Allocator* message_block_allocator, size_t memcpy_tradeoff, ACE_Char_Codeset_Translator *char_translator, ACE_WChar_Codeset_Translator *wchar_translator) @@ -103,6 +106,7 @@ TAO_OutputCDR::TAO_OutputCDR (char *data, byte_order, buffer_allocator, data_block_allocator, + message_block_allocator, memcpy_tradeoff) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER); @@ -129,16 +133,21 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data, TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, ACE_Allocator* buffer_allocator, ACE_Allocator* data_block_allocator, + ACE_Allocator* message_block_allocator, TAO_ORB_Core* orb_core) : ACE_InputCDR (rhs, - buffer_allocator - ? buffer_allocator - : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0), - data_block_allocator - ? data_block_allocator - : (orb_core ? orb_core->output_cdr_dblock_allocator () : - 0)), - orb_core_ (orb_core) + buffer_allocator + ? buffer_allocator + : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0), + data_block_allocator + ? data_block_allocator + : (orb_core ? orb_core->output_cdr_dblock_allocator () : + 0), + message_block_allocator + ? message_block_allocator + : (orb_core ? + orb_core->output_cdr_msgblock_allocator () : 0)), + orb_core_ (orb_core) { this->init_translators (); } |