ChangeLogTag:Fri Sep 19 20:02:13 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

10 files changed, 80 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d603409a850..77c1621f87b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Fri Sep 19 20:02:13 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+	* orbsvcs/Fault_Notifier/FT_Notifier_i.h: Did a 20000 feet level
+	  code review and left comments for OCI folks. More needs to be
+	  done. 
+
+	* orbsvcs/orbsvcs/Makefile.CosLoadBalancing:
+	* orbsvcs/orbsvcs/Makefile.PortableGroup: Added an -I for the IDL
+	  compiler to include orbsvcs
+
+	* orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp:
+	* orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp:
+	* orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp:
+	* orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp: Fixed
+	  compilation errors and unused variable warnings with g++. 
+
 Fri Sep 19 19:49:11 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 33d20ca1136..5c86fb0c380 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -12,6 +12,7 @@
  *  @author Curt Hibbs <hibbs_c@ociweb.com>
  */
 //=============================================================================
+// @@ Pre.h is not required here..
 #include "ace/pre.h"
 #include "FT_ReplicationManager.h"
 #include "FT_Property_Validator.h"
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index eafc36bf367..bf6a1a836c4 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -15,7 +15,9 @@
 #ifndef FT_REPLICATION_MANAGER_H_
 #define FT_REPLICATION_MANAGER_H_
 
-#include "ace/pre.h"
+// @@ OCI Folks please add /**/ with every pre.h. This would make out
+// documentation from doxygen much cleaner.
+#include /**/ "ace/pre.h"
 
 #include "orbsvcs/FT_ReplicationManagerS.h"
 #include "orbsvcs/FT_NotifierC.h"
@@ -36,6 +38,17 @@
 // Forward references
 class TAO_ORB_Manager;
 
+//@@ OCI folks - Could you place the Ft_Replicationmanager in a
+// seperate namespace. This could lead to namespace pollutions. I
+//recommend that you folks place it in namespace TAO like this
+//
+// namespace TAO
+// {
+//   class FT_Replicationmanager {}
+//
+//
+// }
+
 /**
  * Implement the ReplicationManager interfaces.
  *
@@ -89,7 +102,7 @@ private:
   /**
    * Write this factory's IOR to a file
    */
-  int write_IOR ();
+  int write_IOR (void);
 
   /**
    * Extract the value of the InitialNumberReplicas property from
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index 13fdd8bad29..3a52934400d 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -2,8 +2,14 @@
 //
 // $Id$
 
+// @@ OCI folks -- file header please...
 #ifndef FT_NOTIFIER_I_H_
 #define FT_NOTIFIER_I_H_
+
+// @@OCI folks -- please include pre.h before the pragma. Oh, BTW gcc
+// 3.* would complain that  pragma has been deprecated. Probably you
+// should add a simple header file before the pragma.
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -18,6 +24,7 @@
 // Forward references
 class TAO_ORB_Manager;
 
+// @@OCI folks, please use the TAO namespace
 
 class  FT_FaultNotifier_i : public virtual POA_FT::FaultNotifier
 {
@@ -73,6 +80,10 @@ public:
   // CORBA interface
   // See IDL for documentation
 
+  //@@OCI folks, please don't use "WITH_DEFAULTS" since that makes a
+  // TSS lookup, which is slower. Yes, IDL compile generates with
+  //them, but the implementation should have the raw macro.
+
   virtual void push_structured_fault (
       const CosNotification::StructuredEvent & event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing
index ff425b051a6..d9c3052f4d8 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosLoadBalancing
@@ -36,7 +36,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
-        -I$(TAO_ROOT) -Ge 1 -GC -Gv -DCORBA3 \
+        -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -Ge 1 -GC -Gv -DCORBA3 \
         -Wb,export_macro=TAO_LoadBalancing_Export \
         -Wb,export_include=LoadBalancing/LoadBalancing_export.h \
         -Wb,pre_include=ace/pre.h \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup b/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup
index 3be2ae4cde4..cfd477882e3 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup
+++ b/TAO/orbsvcs/orbsvcs/Makefile.PortableGroup
@@ -30,6 +30,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
         -I$(TAO_ROOT) \
+        -I$(TAO_ROOT)/orbsvcs \
 	-Ge 1 \
 	-GC \
         -Wb,export_macro=TAO_PortableGroup_Export \
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 4de41392ad5..ae839f96b4b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -240,7 +240,7 @@ TAO_PG_GenericFactory::delete_object (
             oid.in ()
             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-#endif 0
+#endif
         }
     }
   else
@@ -302,9 +302,9 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
 
 void
 TAO_PG_GenericFactory::delete_member (
-  PortableGroup::ObjectGroupId group_id,
-  const PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroupId ,
+    const PortableGroup::Location &
+    ACE_ENV_ARG_DECL)
 {
 
   //TODO - Fix this code. The original implementation for the load balancer assumed
@@ -594,12 +594,12 @@ TAO_PG_GenericFactory::process_criteria (
 
 void
 TAO_PG_GenericFactory::check_minimum_number_members (
-  PortableGroup::ObjectGroup_ptr object_group,
-  PortableGroup::ObjectGroupId group_id,
+  PortableGroup::ObjectGroup_ptr ,
+  PortableGroup::ObjectGroupId ,
   const char * type_id
   ACE_ENV_ARG_DECL)
 {
- 
+
   //TODO - Fix this code. The original implementation for the load balancer assumed
   //       that the factory-creation-id was the same as the object-group-id. This
   //       is not longer true. The find below is supposed to be a factory-creation-id.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
index 7621b403ed7..3cf6b42ede6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
@@ -8,18 +8,18 @@ ACE_RCSID (PortableGroup,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Hash_Map_Entry<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *>;
-template class ACE_Hash_Map_Manager_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *>;
+template class ACE_Hash_Map_Manager_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::ObjectGroupId, TAO_PG_ObjectGroup_Map_Entry *, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index b1b2eee9776..6e380b32818 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -21,23 +21,21 @@ TAO_PG_PropertyManager::TAO_PG_PropertyManager (
 }
 
 
-void 
-TAO_PG_PropertyManager::init ( 
+void
+TAO_PG_PropertyManager::init (
   TAO_PG_Default_Property_Validator * property_validator )
 {
   if (property_validator)
-  {
-    property_validator_ = property_validator;
-  }
+    {
+      property_validator_ = property_validator;
+    }
   else
-  {
-    ACE_NEW_THROW_EX (
-        property_validator_,
-        TAO_PG_Default_Property_Validator,
-        CORBA::NO_MEMORY ()
-    );
-    ACE_CHECK;
-  }
+    {
+      // @@OCI-folks have an environment variable for throwing
+      // exceptions.
+      ACE_NEW (property_validator_,
+               TAO_PG_Default_Property_Validator);
+    }
 }
 
 
@@ -138,7 +136,7 @@ TAO_PG_PropertyManager::set_type_properties (
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
   Type_Prop_Table::ENTRY * entry;
-  if (this->type_properties_.find (type_id, entry) == 0) 
+  if (this->type_properties_.find (type_id, entry) == 0)
   {
     PortableGroup::Properties & props = entry->int_id_;
     props = overrides;
@@ -246,10 +244,11 @@ TAO_PG_PropertyManager::set_properties_dynamically (
   PortableGroup::Properties * dynamic_properties =
     this->object_group_manager_.get_dynamic_properties (object_group
                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK;
 
   // Now override the dynamic (object group) properties with the new values
-  TAO_PG::override_properties (overrides, *dynamic_properties);
+  TAO_PG::override_properties (overrides,
+                               *dynamic_properties);
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
index 355e36144dc..4827b9f0112 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -34,7 +34,7 @@ TAO_PG::override_properties (
     return;
 
   const CORBA::ULong old_length = properties.length ();
-  const CORBA::ULong new_length = old_length;
+  // const CORBA::ULong new_length = old_length;
 
   // @@ Slow O(n^2) operation.  Note that it may be slower than O(n^2)
   //    if the length of the property sequence must be increased