diff options
Diffstat (limited to 'TAO/tao/CDR.h')
| -rw-r--r-- | TAO/tao/CDR.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index f7406c6000d..1b1168c5cf2 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -163,7 +163,7 @@ public: ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR); /// Destructor. - ~TAO_OutputCDR (void); + ~TAO_OutputCDR (); // @todo do we want a special method to write an array of // strings and wstrings? @@ -190,7 +190,7 @@ public: ACE_CDR::ULong pending_length); /// Are there more data fragments to come? - bool more_fragments (void) const; + bool more_fragments () const; /// Specify whether there are more data fragments to come. void more_fragments (bool more); @@ -202,16 +202,16 @@ public: ACE_Time_Value * timeout); /// Fragmented message request ID. - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Stub object associated with the request. - TAO_Stub * stub (void) const; + TAO_Stub * stub () const; /// Message semantics (twoway, oneway, reply) - TAO_Message_Semantics message_semantics (void) const; + TAO_Message_Semantics message_semantics () const; /// Maximum time to wait for outgoing message to be sent. - ACE_Time_Value * timeout (void) const; + ACE_Time_Value * timeout () const; //@} /// These methods are used by valuetype indirection support. @@ -240,9 +240,10 @@ public: int offset (char* pos); private: - // disallow copying... - TAO_OutputCDR (const TAO_OutputCDR& rhs); - TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs); + TAO_OutputCDR (const TAO_OutputCDR&rhs) = delete; + TAO_OutputCDR& operator= (const TAO_OutputCDR&) = delete; + TAO_OutputCDR (TAO_OutputCDR&&) = delete; + TAO_OutputCDR& operator= (TAO_OutputCDR&&) = delete; private: /** @@ -408,17 +409,15 @@ public: TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, TAO_ORB_Core* orb_core = 0); -#if defined (ACE_HAS_CPP11) TAO_InputCDR& operator= (const TAO_InputCDR&) = default; -#endif /* ACE_HAS_CPP11 */ /// Destructor - virtual ~TAO_InputCDR (void); + virtual ~TAO_InputCDR (); // = TAO specific methods. /// Accessor - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; ACE_Message_Block::Message_Flags clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ); |