Fri Feb 2 16:16:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 13 insertions, 33 deletions

diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index 75cf8ced421..6fee20f5bc2 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -117,7 +117,7 @@ namespace TAO
         // before we leave.
         if (s == TAO_INVOKE_RESTART)
           {
-            const Invocation_Status tmp = this->receive_other_interception ();
+            Invocation_Status const tmp = this->receive_other_interception ();
 
             if (tmp != TAO_INVOKE_SUCCESS)
               s = tmp;
@@ -230,7 +230,7 @@ namespace TAO
      * exception. Success alone is returned through the return value.
      */
 
-    const int reply_error =
+    int const reply_error =
       this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time, rd);
 
     if (TAO_debug_level > 0 && max_wait_time != 0)
@@ -311,8 +311,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd
-                                               )
+  Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd)
   {
     /*
      * Precondition: We probably got a reply. <ACE_Thread::self> is
@@ -510,8 +509,7 @@ namespace TAO
     CORBA::ULong minor = 0;
     CORBA::ULong completion = 0;
 
-    if ((cdr >> minor) == 0
-        || (cdr >> completion) == 0)
+    if ((cdr >> minor) == 0 || (cdr >> completion) == 0)
       {
         throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE);
       }
@@ -520,7 +518,7 @@ namespace TAO
     //
     // Note that we are careful to retain "at most once" semantics.
     if ((ACE_OS_String::strcmp (type_id.in (),
-                                "IDL:omg.org/CORBA/TRANSIENT:1.0")   == 0 ||
+                                "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0 ||
          ACE_OS_String::strcmp (type_id.in (),
                                 "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0 ||
          ACE_OS_String::strcmp (type_id.in (),
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index afa14627a05..85d89087e1d 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -135,15 +135,6 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc)
     }
   else
     {
-      // No allocator, so use the common heap!
-      if (TAO_debug_level == 4)
-        {
-          // This debug is for testing purposes!
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - Synch_Queued_Message::clone\n"
-                      "Using global pool for allocation \n"));
-        }
-
       ACE_NEW_RETURN (qm,
                       TAO_Synch_Queued_Message (mb, this->orb_core_, 0, 0),
                       0);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 9e03e639281..acf91be1416 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -110,8 +110,7 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src)
 }
 
 void
-CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
-                                     ) const
+CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr) const
 {
   if (cdr.write_string (this->_rep_id ())
       && cdr.write_ulong (this->minor ())
@@ -124,8 +123,7 @@ CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void
-CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr
-                                     )
+CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr)
 {
   // The string is read by the caller, to determine the exact type of
   // the exception.  We just decode the fields...
@@ -210,8 +208,7 @@ CORBA::SystemException::_tao_duplicate (void) const
 }
 
 CORBA::ULong
-CORBA::SystemException::_tao_minor_code (u_int location,
-                                         int errno_value)
+CORBA::SystemException::_tao_minor_code (u_int location, int errno_value)
 {
   return
     TAO::VMCID
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 7c2c999804d..b1da978276e 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -120,15 +120,12 @@ namespace CORBA
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ) const;
+    virtual void _tao_encode (TAO_OutputCDR &cdr) const;
 
-    virtual void _tao_decode (TAO_InputCDR &cdr
-                             );
+    virtual void _tao_decode (TAO_InputCDR &cdr);
 
     /// Helper to create a minor status value.
-    static CORBA::ULong _tao_minor_code (u_int location,
-                                         int errno_value);
+    static CORBA::ULong _tao_minor_code (u_int location, int errno_value);
 
     /// Helper to translate a platform-specific errno to a TAO errno
     /// value.
@@ -146,8 +143,7 @@ namespace CORBA
     SystemException & operator= (const SystemException &src);
 
     /// Constructor using a repository id.
-    SystemException (CORBA::ULong code,
-                     CORBA::CompletionStatus completed);
+    SystemException (CORBA::ULong code, CORBA::CompletionStatus completed);
 
     /// Constructor using a repository id.
     SystemException (const char *repository_id,
@@ -158,8 +154,7 @@ namespace CORBA
     /// Return the exception description associated with the given OMG
     /// minor code.
     static const char *_tao_get_omg_exception_description (
-      const CORBA::SystemException &exc,
-      CORBA::ULong minor_code);
+      const CORBA::SystemException &exc, CORBA::ULong minor_code);
 
   private:
     /// Minor code.
@@ -167,7 +162,6 @@ namespace CORBA
 
     /// Completion status.
     CORBA::CompletionStatus completed_;
-
   };
 
   // Declarations for all of the CORBA standard exceptions.