Tue Jul 24 07:56:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 29 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0191dde4e6c..eb2b6078255 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Jul 24 07:56:23 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Base.{h,cpp}:
+        * tao/ORB_Core.h:
+          Laout changes
+
+        * tao/Incoming_Message_Queue.{cpp,inl}:
+          Mode constructor inline
+
+        * tao/Incoming_Message_Stack.h:
+          Fixed typo
+
 Tue Jul 24 06:56:23 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf:
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index a5d0ad2fd01..1fd5493ae3c 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -25,8 +25,8 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core * orb_core,
-                                              TAO_Transport * transport,
+TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
+                                              TAO_Transport *transport,
                                               size_t input_cdr_size)
   : orb_core_ (orb_core)
   , fragmentation_strategy_ (orb_core->fragmentation_strategy (transport))
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index cc50d583191..0670b8d8b11 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -210,7 +210,7 @@ protected:
                               TAO_GIOP_Message_Generator_Parser *);
 
   /// Send error messages
-  int  send_error (TAO_Transport *transport);
+  int send_error (TAO_Transport *transport);
 
   /// Close a connection, first sending GIOP::CloseConnection.
   void send_close_connection (const TAO_GIOP_Message_Version &version,
@@ -225,11 +225,10 @@ protected:
                             IOP::ServiceContextList *svc_info,
                             CORBA::Exception *x);
 
-
   /// Write the locate reply header
   virtual int generate_locate_reply_header (
-      TAO_OutputCDR & /*cdr*/,
-      TAO_Pluggable_Reply_Params_Base & /*params*/);
+      TAO_OutputCDR &cdr,
+      TAO_Pluggable_Reply_Params_Base &params);
 
   /// Is the messaging object ready for processing BiDirectional
   /// request/response?
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index 155b87b4c82..83d1e749059 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -16,13 +16,6 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
-  : last_added_ (0),
-    size_ (0),
-    orb_core_ (orb_core)
-{
-}
-
 TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
 {
   const CORBA::ULong sz = this->size_;
diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl
index 76235e843e9..a5b8a8a06e1 100644
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ b/TAO/tao/Incoming_Message_Queue.inl
@@ -7,6 +7,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /************************************************************************/
 // Methods for TAO_Incoming_Message_Queue
 /************************************************************************/
+
+ACE_INLINE
+TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
+  : last_added_ (0),
+    size_ (0),
+    orb_core_ (orb_core)
+{
+}
+
 ACE_INLINE CORBA::ULong
 TAO_Incoming_Message_Queue::queue_length (void) const
 {
diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h
index f0cfba43043..109e6361ad0 100644
--- a/TAO/tao/Incoming_Message_Stack.h
+++ b/TAO/tao/Incoming_Message_Stack.h
@@ -48,7 +48,7 @@ class Incoming_Message_Stack
 #endif
 {
 public:
-  /// default constructor, intiliazes empty stack.
+  /// default constructor, initiliazes empty stack.
   Incoming_Message_Stack();
 
   /// destructor, releases all elements on stack
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 8fa8b6eb809..bc6cf755d3a 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -867,8 +867,8 @@ public:
   /// Verify condition for  permanent forward is given,
   /// both parameters must provide group attributes.
   CORBA::Boolean is_permanent_forward_condition
-  (const CORBA::Object_ptr obj,
-   const TAO_Service_Context &service_context);
+    (const CORBA::Object_ptr obj,
+    const TAO_Service_Context &service_context);
 
   /// Configuration accessor method
   ACE_Service_Gestalt* configuration () const;