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

8 files changed, 14 insertions, 15 deletions

diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h
index 70b4665ac81..5621629ca74 100644
--- a/TAO/tao/Incoming_Message_Stack.h
+++ b/TAO/tao/Incoming_Message_Stack.h
@@ -21,7 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x591)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x593)
 #include /**/ "tao/TAO_Export.h"
 #endif
 
@@ -67,7 +67,7 @@ public:
   int top (TAO_Queued_Data* &data) const;
 
 private:
-  /// top element of stack
+  /// Top element of stack
   TAO_Queued_Data *top_;
 
 private:
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index cce3cd67c53..0016da30550 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -50,7 +50,7 @@ namespace TAO
                          const char *repo_id,
                          Proxy_Broker_Factory);
 
-    // Version used the operators.
+    /// Version used the operators.
     static T_ptr unchecked_narrow (CORBA::Object_ptr, Proxy_Broker_Factory);
 
     static T_ptr unchecked_narrow (CORBA::Object_ptr,
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index 953edc32888..e0d46e79727 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -91,7 +91,6 @@ private:
 
   /// The locate reply status
   GIOP::LocateStatusType locate_reply_status_;
-
 };
 
 /**
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index 357cb6e1e7d..8870fcec6e5 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -81,9 +81,9 @@ public:
   virtual CORBA::ULong endpoint_count (void) const;
   virtual CORBA::ULong hash (CORBA::ULong max);
   /**
-   * Add <endp> to this profile's list of endpoints (it is inserted
+   * Add @a endp to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
-   * <endp>.
+   * @a endp.
    */
   void add_endpoint (TAO_UIOP_Endpoint *endp);
 
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 408f4ace73f..31246941890 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -541,7 +541,7 @@ namespace
               ACE_Dynamic_Service<
                   TAO_Codeset_Manager_Factory_Base
                 >::instance ("TAO_Codeset");
-#endif
+#endif /* !TAO_AS_STATIC_LIBS && !(ACE_VXWORKS && !__RTP__) */
           }
 
         if (factory == 0)
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
index 14ef32c02b1..51f45f16c9b 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -104,8 +104,10 @@ public:
 
   // = Marshaling and demarshaling
 
-  /// Marshal and demarshal the list.
+  /// Marshal the list.
   int encode (TAO_OutputCDR& cdr) const;
+
+  /// Demarshal the list.
   int decode (TAO_InputCDR& cdr);
 
   /**
@@ -136,10 +138,10 @@ private:
   int get_known_component_i (IOP::TaggedComponent& component) const;
   int get_component_i (IOP::TaggedComponent& component) const;
 
-  /// Is <tag> a well-known component?
+  /// Is @a tag a well-known component?
   int known_tag (IOP::ComponentId tag) const;
 
-  /// Does <tag> show up only once?
+  /// Does @a tag show up only once?
   int unique_tag (IOP::ComponentId tag) const;
 
 private:
@@ -153,7 +155,7 @@ private:
   /// bunch of them.
   IOP::MultipleComponentProfile components_;
 
-  // A flag for each component...
+  /// A flag for each component...
   CORBA::Octet orb_type_set_;
   CORBA::Octet code_sets_set_;
 };
diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index 53cab539d7f..91ebca5d93d 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -40,7 +40,6 @@ namespace TAO
  *
  * @brief This class is used to manipulate and access the target
  *        address field of a GIOP 1.2 request.
- *
  */
 class TAO_Export TAO_Tagged_Profile
 {
@@ -54,7 +53,7 @@ public:
   /// Ctor
   TAO_Tagged_Profile (TAO_ORB_Core *orb_core);
 
-  /// Unmarshall the GIOP 1.2 target address field.
+  /// Unmarshal the GIOP 1.2 target address field.
   CORBA::Boolean unmarshall_target_address (TAO_InputCDR &cdr);
 
   /// Unmarshals the received object key for GIOP 1.0/1.1
@@ -69,7 +68,7 @@ public:
   /// Return a const object key
   const TAO::ObjectKey &object_key (void) const;
 
-  /// get the tagged_profile
+  /// Get the tagged_profile
   const IOP::TaggedProfile &tagged_profile (void) const;
 
   /// Get the profile index, that needs to be used in the
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index f75241f9731..1e8517beb0f 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -789,7 +789,6 @@ TAO_Transport::queue_is_empty_i (void)
   return (this->head_ == 0);
 }
 
-
 int
 TAO_Transport::schedule_output_i (void)
 {