ChangeLogTag: Thu Nov 13 18:47:36 2003 Dale Wilson <wilson_d@ociweb.com>

4 files changed, 28 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c2796c1191d..073fda04ff3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 13 18:47:36 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+          Don't confuse VC6 with an unexpected cast.
+
+        * orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+          More explicit template instantiation issues.
+
 Thu Nov 13 09:07:45 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/tests/FT_App/FT_Client.cpp:
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index c26010601c7..939fc4e3bce 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -556,7 +556,13 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 
   FT::FTDomainId domain_id = 0;
   // note the cast in the next line makes ANY >>= work.
-  if (! ::TAO_PG::find (decoder, ::FT::FT_DOMAIN_ID, ACE_static_cast (const char *, domain_id)) )
+  const char * domain_id_string = 0;
+  if (::TAO_PG::find (decoder, ::FT::FT_DOMAIN_ID, domain_id_string) )
+  {
+    // NOTE the assumption that we can assign a char * to a domain id
+    domain_id = ACE_const_cast (char *, domain_id_string);
+  }
+  else
   {
     domain_id = this->domain_;
 
@@ -582,15 +588,16 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
   }
 
   FT::TypeId object_type = 0;
-  if (! ::TAO_PG::find (decoder, ::FT::FT_TYPE_ID, ACE_static_cast (const char *, object_type)) )
+  const char * object_type_string;
+  if (::TAO_PG::find (decoder, ::FT::FT_TYPE_ID, object_type_string))
   {
-    object_type = "unknown";
-    // Not required: missingParameter = 1;
-    ACE_DEBUG ((LM_DEBUG, "Object type not given.\n"));
+    object_type = ACE_const_cast (char *, object_type_string);
   }
   else
   {
-    ACE_DEBUG ((LM_DEBUG, "Object type: %s\n", object_type));
+    object_type = "unknown";
+    // Not required: missingParameter = 1;
+    ACE_DEBUG ((LM_DEBUG, "Object type not given.\n"));
   }
 
   FT::ObjectGroupId group_id = 0;
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
index 593cb8d7694..3158b4bb20a 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
@@ -28,9 +28,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 // inept compilers.
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class TAO::Utils::Server_Main<FT_FaultNotifier_i>;
+  template class TAO::Utils::Server_Main<TAO::FT_FaultNotifier_i>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Utils::Server_Main<FT_FaultNotifier_i>
+# pragma instantiate TAO::Utils::Server_Main<TAO::FT_FaultNotifier_i>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index c5a7469e92d..e60b3c23ba3 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -452,11 +452,11 @@ long FT_TestReplica_i::load ()
 // competence-challenged compilers.
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template void storeLong(::FT::State_var & state, size_t offset, long value);
-  template long loadLong(const ::FT::State_var & state, size_t offset);
+  template void storeLong <> (::FT::State_var & state, size_t offset, long value);
+  template long loadLong <> (const ::FT::State_var & state, size_t offset);
 
-  template void storeLong(unsigned char * & state, size_t offset, long value);
-  template long loadLong(const unsigned char * & state, size_t offset);
+  template void storeLong <> (unsigned char * & state, size_t offset, long value);
+  template long loadLong <> (const unsigned char * & state, size_t offset);
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # pragma instantiate void storeLong(::FT::State_var & state, size_t offset, long value)