Merge pull request #739 from jwillemsen/master

Doxygen and Embarcadero pch fixes

3 files changed, 7 insertions, 12 deletions

diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index 709e0afbd11..d9520e92332 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -36,13 +36,7 @@ public:
   static int init (void);
 };
 
-static int
-TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
-
-// Typedef for the Reply Handler Skeleton.
-// This is handcrafted not generated by the IDL compiler.
-
-class TAO_InputCDR;
+static const int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
 
 enum TAO_AMI_Reply_Status
 {
@@ -65,7 +59,10 @@ enum TAO_AMI_Reply_Status
   TAO_AMI_REPLY_LOCATION_FORWARD_PERM
 };
 
+class TAO_InputCDR;
 
+/// Typedef for the Reply Handler Skeleton.
+/// This is handcrafted not generated by the IDL compiler.
 typedef void (*TAO_Reply_Handler_Stub)(
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr,
diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index b410dc59066..e2653291683 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -50,13 +50,13 @@ public:
   int rebind (const char *repo_id,
               CORBA::ValueFactory &factory);
 
-  /// Removes entry for repo_id from the map and sets factory to
+  /// Removes entry for @a repo_id from the map and sets factory to
   /// the tied one.
   int unbind (const char *repo_id,
               CORBA::ValueFactory &factory);
 
   /**
-   * Lookup a matching factory for repo_id.
+   * Lookup a matching factory for @a repo_id.
    * Invokes _add_ref () on the factory if found.
    * Returns -1 on failure and 0 on success.
    */
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
index 93bfc9d2fd2..d2c013cf17d 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
@@ -47,11 +47,9 @@ public:
   static int Initializer (void);
 };
 
-static int
-TAO_Requires_ValueType_Initializer =
+static const int TAO_Requires_ValueType_Initializer =
   TAO_Valuetype_Adapter_Factory_Impl::Initializer ();
 
-
 ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Factory_Impl)
 ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Factory_Impl)