diff options
Diffstat (limited to 'TAO/tao/CDR.cpp')
| -rw-r--r-- | TAO/tao/CDR.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 53c4318b9c1..79835eacf2c 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -64,12 +64,12 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size, memcpy_tradeoff, major_version, minor_version) - , fragmentation_strategy_ (0) + , fragmentation_strategy_ (nullptr) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER); @@ -100,12 +100,12 @@ TAO_OutputCDR::TAO_OutputCDR (char *data, memcpy_tradeoff, major_version, minor_version) - , fragmentation_strategy_ (0) + , fragmentation_strategy_ (nullptr) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER); } @@ -132,9 +132,9 @@ TAO_OutputCDR::TAO_OutputCDR (char *data, , fragmentation_strategy_ (fs) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER); } @@ -149,12 +149,12 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data, memcpy_tradeoff, major_version, minor_version) - , fragmentation_strategy_ (0) + , fragmentation_strategy_ (nullptr) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR4_ENTER); } @@ -175,9 +175,9 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block, , fragmentation_strategy_ (fs) , more_fragments_ (false) , request_id_ (0) - , stub_ (0) + , stub_ (nullptr) , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST) - , timeout_ (0) + , timeout_ (nullptr) { ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR5_ENTER); } @@ -291,15 +291,15 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, : ACE_InputCDR (rhs, buffer_allocator ? buffer_allocator - : (orb_core ? orb_core->output_cdr_buffer_allocator () : 0), + : (orb_core ? orb_core->output_cdr_buffer_allocator () : nullptr), data_block_allocator ? data_block_allocator : (orb_core ? orb_core->output_cdr_dblock_allocator () : - 0), + nullptr), message_block_allocator ? message_block_allocator : (orb_core ? - orb_core->output_cdr_msgblock_allocator () : 0)), + orb_core->output_cdr_msgblock_allocator () : nullptr)), orb_core_ (orb_core) { } |