ChangeLogTag: Tue Dec 2 09:59:17 2003 Dale Wilson <wilson_d@ociweb.com>

7 files changed, 30 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4a389fe4d9b..bc09fc82808 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Dec  2 09:59:17 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp:
+        * orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+          Build warnings/errors on Solaris & linux.
+
 Mon Dec  1 16:52:25 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
@@ -11,9 +21,9 @@ Mon Dec  1 16:52:25 2003  Dale Wilson  <wilson_d@ociweb.com>
         * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
           New method: has_member_at to support groups_at_location.
           New method: add_member_to_iogr refactor support for updating IOGR
-          Complete implementations of add_member, create_member, 
+          Complete implementations of add_member, create_member,
           and *populate methods.
-          
+
 
 Mon Dec  1 15:24:27 2003  Dale Wilson  <wilson_d@ociweb.com>
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 90f871875a4..5234a0fe6fb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -573,6 +573,8 @@ void TAO::PG_Object_Group::create_member (
           ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
+    // @@ what if factory_type != type_id != this->type_id_
+
     int created = 0; // bool
     CORBA::ULong factory_count = factories->length ();
     for (CORBA::ULong factory_pos = 0;
@@ -584,18 +586,17 @@ void TAO::PG_Object_Group::create_member (
       {
         PortableGroup::GenericFactory::FactoryCreationId_var fcid;
         CORBA::Object_var member = factory_info.the_factory->create_object (
-          this->type_id_.in (),
+          type_id,
           factory_info.the_criteria,
           fcid. out()
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-
         // convert the new member to a stringified IOR to avoid contamination with group info
-        CORBA::String_var member_ior_string = orb_->object_to_string (member ACE_ENV_ARG_PARAMETER);
+        CORBA::String_var member_ior_string = orb_->object_to_string (member.in () ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        PortableGroup::ObjectGroup_var new_reference = this->add_member_to_iogr (member
+        PortableGroup::ObjectGroup_var new_reference = this->add_member_to_iogr (member.in ()
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
@@ -679,10 +680,10 @@ void TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
           ACE_TRY_CHECK;
 
           // convert the new member to a stringified IOR to avoid contamination with group info
-          CORBA::String_var member_ior_string = orb_->object_to_string (member ACE_ENV_ARG_PARAMETER);
+          CORBA::String_var member_ior_string = orb_->object_to_string (member.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          PortableGroup::ObjectGroup_var new_reference = this->add_member_to_iogr (member
+          PortableGroup::ObjectGroup_var new_reference = this->add_member_to_iogr (member.in ()
             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
index a8bfde4bb02..af2524a1fe1 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
@@ -26,8 +26,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 // inept compilers.
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO::Utils::Server_Main<FactoryRegistry_i>;
+  template class TAO::Utils::Server_Main<TAO::PG_FactoryRegistry>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Utils::Server_Main<FactoryRegistry_i>
+# pragma instantiate TAO::Utils::Server_Main<TAO::PG_FactoryRegistry>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
index 710eefd6f7b..9c89038cdbb 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
@@ -27,8 +27,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 // inept compilers.
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO::Utils::ServantMain<StubFaultNotifier>;
+  template class TAO::Utils::Server_Main<StubFaultNotifier>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Utils::ServantMain<StubFaultNotifier>
+# pragma instantiate TAO::Utils::Server_Main<StubFaultNotifier>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index b5d77ab26ff..f8f39abca76 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -287,7 +287,7 @@ main (int argc, char *argv[])
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template ACE_Vector<ACE_CString>;
+  template class ACE_Vector<ACE_CString>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # pragma instantiate ACE_Vector<ACE_CString>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 7f748e140bd..805f82887de 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -753,9 +753,9 @@ void FT_ReplicaFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 // competence-challenged compilers.
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template ACE_Vector<FT_TestReplica_i *>;
-  template ACE_Guard<ACE_Mutex>;
-  template ACE_Vector<ACE_CString>;
+  template class ACE_Vector<FT_TestReplica_i *>;
+  template class ACE_Guard<ACE_Mutex>;
+  template class ACE_Vector<ACE_CString>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # pragma instantiate ACE_Vector<FT_TestReplica_i *>
 # pragma instantiate ACE_Guard<ACE_Mutex>
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index e60b3c23ba3..89b2b5c1aa2 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -265,7 +265,7 @@ void FT_TestReplica_i::set_update (const FT::State & s)
   ACE_THROW ( FT::InvalidUpdate () );
 #else // FT_TEST_LACKS_UPDATE
   KEVORKIAN(BEFORE_SET_UPDATE, set_update)
-  long counter = loadLong(s, 0);
+  long counter = loadLong<FT::State>(s, 0);
   store(counter);
   KEVORKIAN(AFTER_SET_UPDATE, set_update)
 #endif // FT_TEST_LACKS_UPDATE
@@ -295,7 +295,7 @@ void FT_TestReplica_i::set_state (const FT::State & s)
   ACE_THROW ( FT::InvalidState () );
 #else // FT_TEST_LACKS_STATE
   KEVORKIAN(BEFORE_SET_STATE, set_state)
-  long counter = loadLong(s, 0);
+  long counter = loadLong<FT::State>(s, 0);
   store(counter);
   KEVORKIAN(AFTER_SET_STATE, set_state)
 #endif // FT_TEST_LACKS_STATE
@@ -442,7 +442,7 @@ long FT_TestReplica_i::load ()
     unsigned char buffer[sizeof(long)];
     ACE_OS::fread(buffer, 1, sizeof(long), f);
     ACE_OS::fclose(f);
-    counter = loadLong(buffer, 0);
+    counter = loadLong<unsigned char *>(buffer, 0);
   }
   return counter;
 }