Thu Sep 6 09:24:12 UTC 2007 Johnny WIllemsen <jwillemsen@remedy.nl>

7 files changed, 41 insertions, 36 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5686743829b..570194f046e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,26 +1,43 @@
+Thu Sep  6 09:24:12 UTC 2007  Johnny WIllemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h:
+        * orbsvcs/orbsvcs/PortableGroup.idl:
+          Doxygen improvements
+
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp:
+        * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp:
+          Layout changes
+
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h (create):
+          Added default argument for factory_name, thanks to Lothar
+          Werzingen <lothar at tradescape dot biz> for reporting this
+
+        * orbsvcs/orbsvcs/Notify/Service.h (create):
+          Default argument for pure virtual function is not needed
+
 Wed Sep  5 13:26:26 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_codegen.cpp (start_anyop_header):
-        
+
           Changed logic again to generate empty *A.h file if -GA appears
           with -Sa or -St.
-          
+
         * docs/compiler.html:
-        
+
           Updated command line option table description to reflect the
           change above.
 
 Tue Sep  4 18:05:08 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * docs/compiler.html:
-        
+
           Updated command line option table descriptions to reflect
           changes below.
 
 Tue Sep  4 17:52:54 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_codegen.cpp (start_anyop_header);
-        
+
           Changed the logic of the check at the top of this method so
           that the options to suppress generation of Any operators or
           type codes will override the option to generate a separate
@@ -29,7 +46,7 @@ Tue Sep  4 17:52:54 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Mon Sep 03 02:50:30 CDT 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-	      * TAO version 1.6 released.
+        * TAO version 1.6 released.
 
 Thu Aug 30 08:09:00 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
index cac01eb47f4..6fbb9c609e1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -36,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * to handle scenarios where more than one operation is performed
  * while holding the reference count.
  *
- * @TODO: The type of lock could be parametric
+ * @todo The type of lock could be parametric
  */
 template<class EVENT_CHANNEL, class PROXY>
 class TAO_ESF_Proxy_RefCount_Guard
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index 0638a787613..281272a5d09 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -65,9 +65,7 @@ TAO_Port_Utils<CORBA::ComponentIR::UsesDef>::set_is_multiple (
 
 // ==============================================================
 
-TAO_ComponentDef_i::TAO_ComponentDef_i (
-    TAO_Repository_i *repo
-  )
+TAO_ComponentDef_i::TAO_ComponentDef_i (TAO_Repository_i *repo)
   : TAO_IRObject_i (repo),
     TAO_Container_i (repo),
     TAO_Contained_i (repo),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index d9afb120526..4139bb3a4e2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -59,8 +59,9 @@ public:
     CosNotifyChannelAdmin::EventChannelFactory_ptr factory);
 
   /// Create the Channel Factory.
-  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr
-    create (PortableServer::POA_ptr default_POA, const char* factory_name);
+  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
+    PortableServer::POA_ptr default_POA,
+    const char* factory_name = "EventChannelFactory");
 
   /// Called by the factory when it is destroyed.
   virtual void remove (TAO_Notify_EventChannelFactory* ecf);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index c6cf055cad3..6ca2a812502 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -78,12 +78,12 @@ public:
   /// Create the Channel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
       PortableServer::POA_ptr default_POA,
-      const char* factory_name = "EventChannelFactory") = 0;
+      const char* factory_name) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-/// Deprecated.  Use TAO_COS_NOTIFICATION_SERVICE_NAME instead.
+/// @deprecated Use TAO_COS_NOTIFICATION_SERVICE_NAME instead.
 #define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory"
 
 #define TAO_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
index 97df8e3338f..eb1f3c16cc9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
@@ -256,7 +256,7 @@ module PortableGroup
      * Remove the registration of all factories that create a particular type of object.
      * If no factories exist for the given type, the registry is unchanged.
      * This is not an error.
-     * @param type_id the type of object formerly created by the factories to be unregistered.
+     * @param role the role played by the object formerly created by this factory.
      */
     void unregister_factory_by_role(in RoleName role);
 
@@ -264,7 +264,7 @@ module PortableGroup
      * Remove the registration of all factories that create objects at a particular location.
      * If the location is unknown the registry is unchanged.
      * This is not an error.
-     * @param location where the factories formerly created objects.
+     * @param the_location where the factories formerly created objects.
      */
     void unregister_factory_by_location(in Location the_location);
 
@@ -280,7 +280,7 @@ module PortableGroup
      * List all the factories that create a objects at a given location.
      * If no factories are registered for this location, an empty list is returned.
      * This is not an error.
-     * @param location where the factories create objects.
+     * @param the_location where the factories create objects.
      */
     FactoryInfos list_factories_by_location(in Location the_location);
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index d6a665341a5..8c54dca4e95 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -183,39 +183,28 @@ TAO::Security::ORBInitializer::register_policy_factories (
   CORBA::PolicyType type;
 
   type = ::Security::SecQOPPolicy;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = ::Security::SecMechanismsPolicy;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = ::Security::SecInvocationCredentialsPolicy;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = ::Security::SecFeaturePolicy;   // Deprecated
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = ::Security::SecDelegationDirectivePolicy;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = ::Security::SecEstablishTrustPolicy;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
-
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = SecurityLevel3::ContextEstablishmentPolicyType;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
-
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   type = SecurityLevel3::ObjectCredentialsPolicyType;
-  info->register_policy_factory (type,
-                                 this->policy_factory_.in ());
-
+  info->register_policy_factory (type, this->policy_factory_.in ());
 
   // ----------------------------------------------------------------
 }