Layout and docu changes

    * TAO/tao/Object.cpp:
    * TAO/tao/Service_Callbacks.cpp:
    * TAO/tao/Service_Callbacks.h:

3 files changed, 4 insertions, 18 deletions

diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index b96ae7b5125..2aeede4233d 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -342,13 +342,12 @@ CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker)
 CORBA::Boolean
 CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
 {
-
-  // If the profile length is zero for a non-evaluted IOR it is a
+  // If the profile length is zero for a non-evaluated IOR it is a
   // null-object.
   if ((!obj->is_evaluated ()) && obj->ior ().profiles.length () == 0)
     return true;
 
-  // To accomodate new definitions.
+  // To accommodate new definitions.
   if (obj->orb_core_)
     {
       return obj->orb_core_->object_is_nil (obj);
@@ -357,8 +356,6 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
   return false;
 }
 
-
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -692,8 +689,7 @@ CORBA::Object::proxy_broker (void) const
 {
   // Paranoid check. We *should* never access the proxy_broker
   // when the object has not been initialised so there *should*
-  // alway be a stub, but just in case...
-
+  // always be a stub, but just in case...
   if (this->protocol_proxy_)
     {
       return this->protocol_proxy_->object_proxy_broker ();
@@ -872,7 +868,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
     {
       // If the user has set up a eager strategy..
       CORBA::String_var type_hint;
-
       if (!(cdr >> type_hint.inout ()))
         return false;
 
@@ -904,7 +899,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 
       // Ownership of type_hint is given to TAO_Stub
       // TAO_Stub will make a copy of mp!
-
       TAO_Stub *objdata = 0;
 
       try
@@ -1009,7 +1003,6 @@ operator<< (std::ostream &strm, CORBA::Object_ptr _tao_objref)
 // Traits specializations for CORBA::Object.
 namespace TAO
 {
-
   void In_Object_Argument_Cloner_T<CORBA::InterfaceDef_ptr>::duplicate
                                               (CORBA::InterfaceDef_ptr)
   {
@@ -1046,8 +1039,6 @@ namespace TAO
   }
 } // close TAO namespace
 
-
 TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0;
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index b830c4d863c..ac33d59c6a5 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -16,7 +16,6 @@ TAO_Service_Callbacks::select_profile (const TAO_MProfile & /*mprofile*/,
   return false;
 }
 
-
 CORBA::Boolean
 TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
 {
@@ -25,7 +24,6 @@ TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
   return true;
 }
 
-
 TAO_Service_Callbacks::Profile_Equivalence
 TAO_Service_Callbacks::is_profile_equivalent (const TAO_Profile *,
                                               const TAO_Profile *)
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 9940ab56ac0..1fd5c281e78 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -51,13 +51,12 @@ namespace IOP
  * @brief An Abstract Base class for the hooks in the ORB.
  *
  * This class (would) define all the hooks that may be needed by
- * the ORB to override some of its default behaviour. The methods
+ * the ORB to override some of its default behavior. The methods
  * can be potentially used to call service level specific
  * processing that may be required.
  */
 class TAO_Export TAO_Service_Callbacks
 {
-
 public:
 
   enum Profile_Equivalence
@@ -67,7 +66,6 @@ public:
     DONT_KNOW
   };
 
-
   /// Dtor
   virtual ~TAO_Service_Callbacks (void);
 
@@ -79,7 +77,6 @@ public:
   /// Check whether @a obj is nil or not.
   virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
 
-
   /// Check for equivalency of the two profiles
   virtual Profile_Equivalence is_profile_equivalent (const TAO_Profile *,
                                                      const TAO_Profile *);