diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-21 15:34:06 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-21 15:34:06 +0000 |
| commit | b82714d5a6ea780e367e712ebbd766e488ef1d2a (patch) | |
| tree | c6aeda0a0449b52ffc22ebac5ceff9b84cbd5208 | |
| parent | 0ea8fe8dbfeab734f7e1b16b31263d5227d00043 (diff) | |
| download | ATCD-b82714d5a6ea780e367e712ebbd766e488ef1d2a.tar.gz | |
ChangeLogTag: Tue Dec 21 09:32:34 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 0a7b63739a1..cae75d133fa 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Tue Dec 21 09:32:34 1999 David L. Levine <levine@cs.wustl.edu> + + * orbsvcs/orbsvcs/Log/LogMgr_i.cpp: removed + ACE_Equal_To<DsLogAdmin::LogId> explicit instantiation, + because it duplicated the ACE_Equal_To <CORBA::ULong> + instantiation in tao/Transport_Mux_Strategy.cpp. + Tue Dec 21 08:34:03 1999 David L. Levine <levine@cs.wustl.edu> * orbsvcs/orbsvcs/Makefile (TAO_ORBSVCS_SRCS): removed diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index ab7328c3107..c9fabee48b8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -109,7 +109,6 @@ template class ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_ template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -template class ACE_Equal_To<DsLogAdmin::LogId>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -121,6 +120,5 @@ template class ACE_Equal_To<DsLogAdmin::LogId>; #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_SYNCH_MUTEX>; -#pragma instantiate ACE_Equal_To<DsLogAdmin::LogId> #endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ |