Wed Jan 24 15:46:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 30 insertions, 56 deletions

diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index 99d431bc2cb..9fe7ff5a30d 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -18,15 +18,14 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void)
   // No-Op.
 }
 
-TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (
-  const TAO_Abstract_ServantBase &)
+TAO_Abstract_ServantBase::TAO_Abstract_ServantBase
+  (const TAO_Abstract_ServantBase &)
 {
   // No-Op
 }
 
-TAO_Abstract_ServantBase&
-TAO_Abstract_ServantBase::operator= (
-  const TAO_Abstract_ServantBase&)
+TAO_Abstract_ServantBase &
+TAO_Abstract_ServantBase::operator= (const TAO_Abstract_ServantBase&)
 {
   return *this;
 }
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index 96fa3abc2da..f0619104cb2 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -242,9 +242,9 @@ public:
    * maintains ownership of the underlying buffer.  Elements in the
    * returned buffer may be directly replaced by the caller.  For
    * sequences of strings, wide strings, and object references, the
-   * caller must use the sequence <release> accessor to determine
-   * whether elements should be freed (using <string_free>,
-   * <wstring_free>, or <CORBA::release> for strings, wide strings,
+   * caller must use the sequence @c release accessor to determine
+   * whether elements should be freed (using @c string_free,
+   * @c wstring_free, or @c CORBA::release for strings, wide strings,
    * and object references, respective) before being directly assigned
    * to.
    *
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 795a3b3f768..00c30c716b2 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -72,9 +72,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
     {
       try
         {
-          info->register_policy_factory (*i,
-                                         policy_factory.in ()
-                                        );
+          info->register_policy_factory (*i, policy_factory.in ());
         }
       catch ( ::CORBA::BAD_INV_ORDER& ex)
         {
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index 0227fa0d23b..e35324dcfb9 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -40,13 +40,10 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
-
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 )
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  )
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -54,8 +51,7 @@ public:
 private:
 
   /// Register PortableServer policy factories.
-  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                 );
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index 7b337421ed3..d62e0e5f103 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -20,8 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_PortableServer_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    )
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
index f6c07dfca62..40f95076ee6 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -32,8 +32,7 @@ class TAO_PortableServer_PolicyFactory
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value
-                                   )
+                                   const CORBA::Any & value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
index 166da908552..b416d2faef1 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp
@@ -15,14 +15,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   void
-  ServerRequestDetails::apply_policies (
-      const CORBA::PolicyList &policies
-      )
+  ServerRequestDetails::apply_policies (const CORBA::PolicyList &policies)
   {
     // Flag to check for duplicate ProcessingModePolicy objects in the list.
     bool processing_mode_applied = false;
 
-    const CORBA::ULong plen = policies.length ();
+    CORBA::ULong const plen = policies.length ();
 
     for (CORBA::ULong i = 0; i < plen; ++i)
       {
@@ -35,7 +33,7 @@ namespace TAO
           }
 
         // Obtain the PolicyType from the current Policy object.
-        const CORBA::PolicyType policy_type =
+        CORBA::PolicyType const policy_type =
           policy->policy_type ();
 
         if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
@@ -44,7 +42,7 @@ namespace TAO
               {
                 // This is the second time we have run into this policy type,
                 // and that is not allowed.
-                throw ( ::CORBA::INV_POLICY ());
+                throw ::CORBA::INV_POLICY ();
               }
 
             // Flip the flag to true in order to trap any dupes.
@@ -53,17 +51,15 @@ namespace TAO
             // Narrow the Policy to the ProcessingModePolicy interface.
             PortableInterceptor::ProcessingModePolicy_var pm_policy =
                     PortableInterceptor::ProcessingModePolicy::_narrow (
-                                                 policy.in ()
-                                                );
+                                                 policy.in ());
 
             // Save the value of the ProcessingModePolicy in our data member.
-            this->processing_mode_ =
-              pm_policy->processing_mode ();
+            this->processing_mode_ = pm_policy->processing_mode ();
           }
         else
           {
             // We don't support the current policy type.
-            throw ( ::CORBA::INV_POLICY ());
+            throw ::CORBA::INV_POLICY ();
           }
       }
   }
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index e513b153961..0ec3b31de8a 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -53,8 +53,7 @@ namespace TAO
   public:
     ServerRequestDetails (void);
 
-    void apply_policies (const CORBA::PolicyList& policies
-                        );
+    void apply_policies (const CORBA::PolicyList& policies);
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated server request interceptor based upon the
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index d686d43b5e0..b40652ee427 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -182,11 +182,10 @@ TAO::ServerRequestInfo::result (void)
 
   // Generate the result on demand.
 
-  static CORBA::Boolean const tk_void_any = 1;
+  static CORBA::Boolean const tk_void_any = true;
 
   CORBA::Any * result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any
-                                   );
+    TAO_RequestInfo_Util::make_any (tk_void_any);
 
   CORBA::Any_var safe_result_any = result_any;
 
@@ -245,8 +244,7 @@ TAO::ServerRequestInfo::forward_reference (void)
 }
 
 CORBA::Any *
-TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                  )
+TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -271,31 +269,23 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
 }
 
 IOP::ServiceContext *
-TAO::ServerRequestInfo::get_request_service_context (
-    IOP::ServiceId id
-    )
+TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
     this->server_request_.request_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                     );
+  return this->get_service_context_i (service_context_list, id);
 }
 
 IOP::ServiceContext *
-TAO::ServerRequestInfo::get_reply_service_context (
-    IOP::ServiceId id
-    )
+TAO::ServerRequestInfo::get_reply_service_context (IOP::ServiceId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context & service_context_list =
     this->server_request_.reply_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                     );
+  return this->get_service_context_i (service_context_list, id);
 }
 
 IOP::ServiceContext *
@@ -366,7 +356,6 @@ TAO::ServerRequestInfo::server_id (void)
     return
       CORBA::string_dup (this->server_request_.orb_core ()->server_id ());
 
-
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
@@ -396,8 +385,7 @@ TAO::ServerRequestInfo::adapter_name (void)
   // in this sequence.
   if (this->servant_upcall_ != 0)
     return
-      this->servant_upcall_->poa ().adapter_name (
-        );
+      this->servant_upcall_->poa ().adapter_name ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -433,7 +421,7 @@ TAO::ServerRequestInfo::object_id (void)
       //    case, this is still faster than the
       //    PortableServer::Current::object_id() method since no TSS
       //    access is involved.
-      const CORBA::ULong len = id.length ();
+      CORBA::ULong const len = id.length ();
       obj_id->length (len);
       CORBA::Octet *buffer = obj_id->get_buffer ();
       ACE_OS::memcpy (buffer, id.get_buffer (), len);