Wed Jun 18 11:58:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 41 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a8f2d081928..5f495cbe786 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,26 @@
+Wed Jun 18 11:58:00 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * tao/Unbounded_Octet_Sequence_T.h:
+        * tao/Transport.cpp:
+        * tao/Compression/zlib/ZlibCompressor.cpp:
+          Layout change
+
+        * tao/TAO_Server_Request.h:
+          Doxygen changes
+
+        * tao/Service_Context.cpp:
+        * tao/Service_Context.inl:
+          Moved set_context to inline file
+
+        * tao/Invocation_Base.h:
+          Made is_remote_request_ a const member
+
+        * tao/GIOP_Message_Generator_Parser_12.h:
+          Layout and doxygen change
+
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+          Layout and use ! instead of compare with false
+
 Wed Jun 18 10:07:00 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tao/TAO_Internal.cpp:
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
index 10d29f95efd..6feddcc7ec5 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
@@ -24,7 +24,6 @@ ZlibCompressor::compress (
   )
 {
   uLongf max_length = static_cast <uLongf> (source.length () * 1.1) + 12;
-
   target.length (static_cast <CORBA::ULong> (max_length));
 
   int const retval = ::compress2 (reinterpret_cast <Bytef*>(target.get_buffer ()),
@@ -48,8 +47,7 @@ ZlibCompressor::decompress (
   const ::CORBA::OctetSeq & source,
   ::CORBA::OctetSeq & target)
 {
-  uLongf max_length = static_cast <uLongf> (target.length ())
-;
+  uLongf max_length = static_cast <uLongf> (target.length ());
   int const retval = uncompress (reinterpret_cast <Bytef*>(target.get_buffer ()),
                                  &max_length,
                                  reinterpret_cast <const Bytef*>(source.get_buffer ()),
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index ceba1d9655c..b9b988a8500 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -154,7 +154,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
   if (!(output << reply.service_context_notowned ()))
     return false;
 #else
-  if (reply.is_dsi_ == false)
+  if (!reply.is_dsi_)
     {
       if (!(output << reply.service_context_notowned ()))
         return false;
@@ -287,10 +287,9 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_reply_mesg (
 
   if (status_info.status == GIOP::OBJECT_FORWARD)
     {
-      CORBA::Object_ptr object_ptr =
-        status_info.forward_location_var.in ();
+      CORBA::Object_ptr object_ptr = status_info.forward_location_var.in ();
 
-      if ((output << object_ptr) == false)
+      if (!(output << object_ptr))
         {
           if (TAO_debug_level > 0)
             {
@@ -400,7 +399,6 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
       hdr_status = (CORBA::Boolean) input.good_bit ();
     }
 
-
   return hdr_status ? 0 : -1;
 }
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index 58b23b5046f..f004194fa9b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -33,7 +33,7 @@ class TAO_Transport;
  *
  */
 
-class TAO_GIOP_Message_Generator_Parser_12:
+class TAO_GIOP_Message_Generator_Parser_12 :
   public TAO_GIOP_Message_Generator_Parser
 {
 public:
@@ -95,7 +95,7 @@ private:
 
   /// Marshall the TargetSpecification
 
-  /// This method may be required for other GIOP versiona coming out
+  /// This method may be required for other GIOP version coming out
   /// later than 1.2. We need to share this method
   bool marshall_target_spec (TAO_Target_Specification &spec,
                              TAO_OutputCDR &msg);
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 961d4bf9d23..115a3fac224 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -233,7 +233,7 @@ namespace TAO
 
     /// Flag used to distinguish a remote invocation versus a collocated
     /// (thru-poa) invocation.
-    bool is_remote_request_;
+    bool const is_remote_request_;
 #endif /*TAO_HAS_INTERCEPTORS*/
     //@}
   };
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index 6e9088a6f3b..c1582970bd9 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -87,12 +87,6 @@ TAO_Service_Context::set_context (const IOP::ServiceContext &context,
 }
 
 void
-TAO_Service_Context::set_context (IOP::ServiceContext &context)
-{
-  this->add_context_i (context);
-}
-
-void
 TAO_Service_Context::set_context_i (const IOP::ServiceContext& context)
 {
   // @@ TODO Some contexts can show up multiple times, others
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
index 50dbc7c9559..84d7ddda4ba 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -50,4 +50,10 @@ TAO_Service_Context::is_service_id (IOP::ServiceId id)
   return false;
 }
 
+ACE_INLINE void
+TAO_Service_Context::set_context (IOP::ServiceContext &context)
+{
+  this->add_context_i (context);
+}
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 281937636e9..c2d9be81238 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -230,13 +230,13 @@ public:
 
   void tao_send_reply_exception (const CORBA::Exception& ex);
 
-  /// Set the boolean member to 1.
+  /// Set the boolean member to true.
   void is_dsi (void);
 
   /// Set the member.
   void dsi_nvlist_align (ptrdiff_t alignment);
 
-  // Get the operation details for the current request.
+  /// Get the operation details for the current request.
   TAO_Operation_Details const * operation_details (void) const;
 
   /// Set the argument_flag
@@ -347,7 +347,7 @@ private:
 
   /**
    * An argument flag to indicate whether there is any data that is
-   * going to get marshaled along as a reply. The default will be 1
+   * going to get marshaled along as a reply. The default will be true
    * which indicates that we have some data that needs to be sent back
    * to the client.
    */
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 1e8517beb0f..2b2820f5ea2 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -2176,7 +2176,7 @@ TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
       // This prevents seeking rd_ptr behind the wr_ptr
 
       if (qd.missing_data () != 0 ||
-          qd.more_fragments ()   ||
+          qd.more_fragments () ||
           qd.msg_type () == GIOP::Fragment)
         {
           if (qd.missing_data () == 0)
diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
index 5942c0c85f6..dbe1f4a604a 100644
--- a/TAO/tao/Unbounded_Octet_Sequence_T.h
+++ b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -102,8 +102,7 @@ public:
       {
         // As we are in CORBA mode, all the data blocks would be aligned
         // on an 8 byte boundary
-        ACE_Message_Block msgb (*mb,
-                                ACE_CDR::MAX_ALIGNMENT);
+        ACE_Message_Block msgb (*mb, ACE_CDR::MAX_ALIGNMENT);
 
         // Get the base pointer of the incoming message block
         char *start = ACE_ptr_align_binary (mb->base (),