diff options
Diffstat (limited to 'TAO/orbsvcs')
20 files changed, 32 insertions, 33 deletions
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp index 7710778bdc5..36b0a4962e1 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp @@ -28,7 +28,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<TAO::FT_ReplicationManager>; + template class TAO::Utils::Server_Main<TAO::FT_ReplicationManager>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<TAO::FT_ReplicationManager> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 504d05b59fd..c26010601c7 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -797,9 +797,9 @@ CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL // competence-challenged compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template ACE_Vector<TAO::Fault_Detector_i *>; - template ACE_Guard<ACE_SYNCH_MUTEX>; - template auto_ptr<TAO::Fault_Detector_i>; + template class ACE_Vector<TAO::Fault_Detector_i *>; + template class ACE_Guard<ACE_SYNCH_MUTEX>; + template class auto_ptr<TAO::Fault_Detector_i>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Vector<TAO::Fault_Detector_i *> # pragma instantiate ACE_Guard<ACE_SYNCH_MUTEX> diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp index 498cbc5aff2..a9bb89197d9 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp @@ -28,7 +28,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<TAO::FT_FaultDetectorFactory_i>; + template class TAO::Utils::Server_Main<TAO::FT_FaultDetectorFactory_i>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<TAO::FT_FaultDetectorFactory_i> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 2affd6dd773..28af788d55a 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -751,7 +751,7 @@ TAO::FT_FaultNotifier_i::ProxyInfo::ProxyInfo (const ProxyInfo & rhs) { } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template ACE_Guard<ACE_SYNCH_MUTEX>; + template class ACE_Guard<ACE_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Guard<ACE_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp index 54162acea31..593cb8d7694 100644 --- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp +++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp @@ -28,7 +28,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<FT_FaultNotifier_i>; + template class TAO::Utils::Server_Main<FT_FaultNotifier_i>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<FT_FaultNotifier_i> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index da7fa2e5e52..7fabf33b073 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -350,21 +350,21 @@ PortableGroup::TypeId TAO::PG_Object_Group::get_type_id () const #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template ACE_Hash_Map_Manager_Ex < + template class ACE_Hash_Map_Manager_Ex < PortableGroup::Location, TAO::PG_Object_Group::MemberInfo *, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, - TAO::PG_Object_Group::MemberMapMutex>; - template ACE_Hash_Map_Entry < + TAO_SYNCH_MUTEX>; + template class ACE_Hash_Map_Entry < PortableGroup::Location, TAO::PG_Object_Group::MemberInfo *>; - template ACE_Hash_Map_Iterator_Ex < + template class ACE_Hash_Map_Iterator_Ex < PortableGroup::Location, TAO::PG_Object_Group::MemberInfo *, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, - TAO::PG_Object_Group::MemberMapMutex>; + TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index fff5bc866f7..89caed4f749 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -49,7 +49,6 @@ namespace TAO */ class TAO_PortableGroup_Export PG_Object_Group { - // Information about an object group member struct MemberInfo { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp index e7bcd24a117..faad8d41c8d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp @@ -158,7 +158,7 @@ int TAO_PG::test_encode_decode () #endif // PG_PS_UNIT_TEST #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template ACE_Hash_Map_Manager< + template class ACE_Hash_Map_Manager< ACE_CString, const PortableGroup::Value *, ACE_SYNCH_NULL_MUTEX>; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp index 82a123bc254..d9ac6f060f2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp @@ -60,8 +60,8 @@ void TAO_PG::Properties_Encoder::encode ( } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template ACE_Pair< ACE_CString, PortableGroup::Value>; - template ACE_Vector< TAO_PG::Properties_Encoder::NamedValue, 10 >; + template class ACE_Pair< ACE_CString, PortableGroup::Value>; + template class ACE_Vector< TAO_PG::Properties_Encoder::NamedValue, 10 >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Pair< ACE_CString, PortableGroup::Value> # pragma instantiate ACE_Vector< TAO_PG::Properties_Encoder::NamedValue, 10 > diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp index c4973abaf02..36657366c10 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp @@ -26,7 +26,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<StubFaultAnalyzer>; + template class TAO::Utils::Server_Main<StubFaultAnalyzer>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<StubFaultAnalyzer> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp index c4f9793e561..a8bfde4bb02 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp @@ -26,7 +26,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<FactoryRegistry_i>; + template class TAO::Utils::Server_Main<FactoryRegistry_i>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<FactoryRegistry_i> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp index 2fa8d2746aa..8236a0465d0 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp @@ -27,7 +27,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter>; + template class TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter> #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 562932ef61b..710eefd6f7b 100644 --- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp +++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp @@ -27,7 +27,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // inept compilers. #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::ServantMain<StubFaultNotifier>; + template class TAO::Utils::ServantMain<StubFaultNotifier>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::ServantMain<StubFaultNotifier> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index e4c7395b23e..8ac6400b516 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -615,8 +615,8 @@ main (int argc, char *argv[]) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template Client<FT_TEST::TestReplica, FT_TEST::TestReplica_var>; - template ACE_Vector<ACE_CString>; + template class Client<FT_TEST::TestReplica, FT_TEST::TestReplica_var>; + template class ACE_Vector<ACE_CString>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate Client<FT_TEST::TestReplica, FT_TEST::TestReplica_var> # pragma ACE_Vector<ACE_CString> diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index e9f32a02cdd..0ae5d663b52 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -277,7 +277,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_Replica.cpp b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp index 468d0a18393..43bd2b8b219 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp @@ -22,7 +22,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template TAO::Utils::Server_Main<FT_ReplicaFactory_i>; + template class TAO::Utils::Server_Main<FT_ReplicaFactory_i>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Utils::Server_Main<FT_ReplicaFactory_i> #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 412e411e198..5d7c741da79 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -762,9 +762,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/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 397c303a12a..5218bdfd467 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -374,8 +374,8 @@ int ReplicationManagerFaultConsumerAdapter::idle(int & result) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template instantiate ACE_Vector < const char * >; - template ACE_Vector < FT::PullMonitorable_var > ; + template class ACE_Vector < const char * >; + template class ACE_Vector < FT::PullMonitorable_var > ; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Vector < const char * > # pragma instantiate ACE_Vector < FT::PullMonitorable_var > diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index a47cb6a7f25..300ca63e8c8 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -266,8 +266,8 @@ int StubFaultAnalyzer::idle(int & result) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template instantiate ACE_Vector < const char * >; - template ACE_Vector < FT::PullMonitorable_var > ; + template class ACE_Vector < const char * >; + template class ACE_Vector < FT::PullMonitorable_var > ; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Vector < const char * > # pragma instantiate ACE_Vector < FT::PullMonitorable_var > diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index f093694a5f3..dcdf0e0a5fa 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -486,8 +486,8 @@ int StubFaultNotifier::idle(int & result) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template instantiate ACE_Vector < const char * >; - template ACE_Vector < FT::PullMonitorable_var > ; + template class ACE_Vector < const char * >; + template class ACE_Vector < FT::PullMonitorable_var > ; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Vector < const char * > # pragma instantiate ACE_Vector < FT::PullMonitorable_var > |