Merge pull request #1442 from jwillemsen/jwi-simplifycpp11

Simplify these files using C++11

5 files changed, 27 insertions, 58 deletions

diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl
index 08d0efeae3e..38b70f01019 100644
--- a/TAO/tao/CDR.inl
+++ b/TAO/tao/CDR.inl
@@ -59,8 +59,7 @@ TAO_OutputCDR::timeout (void) const
 ACE_INLINE void
 TAO_OutputCDR::get_version (TAO_GIOP_Message_Version& giop_version)
 {
-  giop_version.major = this->major_version_;
-  giop_version.minor = this->minor_version_;
+  giop_version.set_version (this->major_version_, this->minor_version_);
 }
 
 ACE_INLINE TAO_OutputCDR::Repo_Id_Map_Handle&
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
index 0619ff42814..b03de3109bd 100644
--- a/TAO/tao/GIOP_Message_State.h
+++ b/TAO/tao/GIOP_Message_State.h
@@ -39,7 +39,8 @@ class TAO_Export TAO_GIOP_Message_State
 {
 public:
   /// Constructor
-  TAO_GIOP_Message_State ();
+  TAO_GIOP_Message_State () = default;
+  ~TAO_GIOP_Message_State () = default;
 
   /// Parse the message header.
   ///
@@ -99,36 +100,36 @@ private:
 
 private:
   /// GIOP version information..
-  TAO_GIOP_Message_Version giop_version_;
+  TAO_GIOP_Message_Version giop_version_ {TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR};
 
   /// 0 = big, 1 = little
-  CORBA::Octet byte_order_;
+  CORBA::Octet byte_order_ {0};
 
   /// MsgType above
-  GIOP::MsgType message_type_;
+  GIOP::MsgType message_type_ {GIOP::Request};
 
   /// In byte_order!
-  CORBA::ULong payload_size_;
+  CORBA::ULong payload_size_ {0};
 
   /// (Requests and Replys)
   /// A value of zero indicates that this message does not have any
   /// fragments.  A value of non-zero indicates that it does have
   /// fragments.
-  CORBA::Boolean more_fragments_;
+  CORBA::Boolean more_fragments_ {false};
 
   /// Compressed
-  CORBA::Boolean compressed_;
+  CORBA::Boolean compressed_ {false};
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-static const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12;
-static const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8;
-static const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6;
-static const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET  = 7;
-static const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5;
-static const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
-static const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4;
+constexpr size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12;
+constexpr size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8;
+constexpr size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6;
+constexpr size_t TAO_GIOP_MESSAGE_TYPE_OFFSET  = 7;
+constexpr size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5;
+constexpr size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
+constexpr size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4;
 
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_State.inl"
diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl
index ca6e573d523..1bdeb20c34e 100644
--- a/TAO/tao/GIOP_Message_State.inl
+++ b/TAO/tao/GIOP_Message_State.inl
@@ -2,44 +2,32 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE
-TAO_GIOP_Message_State::TAO_GIOP_Message_State (void)
-  : giop_version_ (TAO_DEF_GIOP_MAJOR,
-                   TAO_DEF_GIOP_MINOR),
-    byte_order_ (0),
-    message_type_ (GIOP::Request),
-    payload_size_ (0),
-    more_fragments_ (false),
-    compressed_ (false)
-{
-}
-
 ACE_INLINE CORBA::ULong
-TAO_GIOP_Message_State::message_size (void) const
+TAO_GIOP_Message_State::message_size () const
 {
   return this->payload_size_ + TAO_GIOP_MESSAGE_HEADER_LEN;
 }
 
 ACE_INLINE CORBA::ULong
-TAO_GIOP_Message_State::payload_size (void) const
+TAO_GIOP_Message_State::payload_size () const
 {
   return this->payload_size_;
 }
 
 ACE_INLINE CORBA::Octet
-TAO_GIOP_Message_State::byte_order (void) const
+TAO_GIOP_Message_State::byte_order () const
 {
   return this->byte_order_;
 }
 
 ACE_INLINE GIOP::MsgType
-TAO_GIOP_Message_State::message_type (void) const
+TAO_GIOP_Message_State::message_type () const
 {
   return this->message_type_;
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_GIOP_Message_State::more_fragments (void) const
+TAO_GIOP_Message_State::more_fragments () const
 {
   return this->more_fragments_;
 }
@@ -51,14 +39,14 @@ TAO_GIOP_Message_State::more_fragments (CORBA::Boolean fragment)
 }
 
 ACE_INLINE TAO_GIOP_Message_Version const &
-TAO_GIOP_Message_State::giop_version (void) const
+TAO_GIOP_Message_State::giop_version () const
 {
   return this->giop_version_;
 }
 
 #if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP ==1
 ACE_INLINE CORBA::Boolean
-TAO_GIOP_Message_State::compressed (void) const
+TAO_GIOP_Message_State::compressed () const
 {
   return this->compressed_;
 }
diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h
index 4605ad57ff4..d740836b8ad 100644
--- a/TAO/tao/GIOP_Message_Version.h
+++ b/TAO/tao/GIOP_Message_Version.h
@@ -50,7 +50,8 @@ public:
   CORBA::Octet minor_version () const;
 
   /// Copy constructor
-  TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src);
+  TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &) = default;
+  TAO_GIOP_Message_Version (TAO_GIOP_Message_Version &&) = default;
 
   /// Default constructor.
   TAO_GIOP_Message_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR,
@@ -60,7 +61,8 @@ public:
   void set_version (CORBA::Octet maj, CORBA::Octet min);
 
   /// Copy operator.
-  TAO_GIOP_Message_Version &operator= (const TAO_GIOP_Message_Version &src);
+  TAO_GIOP_Message_Version &operator= (const TAO_GIOP_Message_Version &) = default;
+  TAO_GIOP_Message_Version &operator= (TAO_GIOP_Message_Version &&) = default;
 
   /// Equality operator
   bool operator== (const TAO_GIOP_Message_Version &src) const;
diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl
index c78ee53502f..5fb5c6b5536 100644
--- a/TAO/tao/GIOP_Message_Version.inl
+++ b/TAO/tao/GIOP_Message_Version.inl
@@ -3,14 +3,6 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (
-    const TAO_GIOP_Message_Version &src)
-  : major (src.major),
-    minor (src.minor)
-{
-}
-
-ACE_INLINE
 TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj,
                                                     CORBA::Octet min)
   : major (maj),
@@ -18,19 +10,6 @@ TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj,
 {
 }
 
-ACE_INLINE TAO_GIOP_Message_Version &
-TAO_GIOP_Message_Version::operator= (const TAO_GIOP_Message_Version &src)
-{
-  if (this != &src)
-    {
-      this->major = src.major;
-      this->minor = src.minor;
-    }
-
-  return *this;
-}
-
-
 ACE_INLINE void
 TAO_GIOP_Message_Version::set_version (CORBA::Octet maj, CORBA::Octet min)
 {