summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrish <krish@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-13 19:56:49 +0000
committerkrish <krish@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-13 19:56:49 +0000
commitea012f5cd1ffcb5b52018c5cb37a0b794f583468 (patch)
tree7514f142091277afbd8216735ed009d5f63afcc4
parent330ecf8fc69a489261f479bcd8e88cfc646391f9 (diff)
downloadATCD-ea012f5cd1ffcb5b52018c5cb37a0b794f583468.tar.gz
ChangeLogTag: Mon Dec 13 13:50:13 1999 Krishnakumar Elakkara Pathayapura <krish@danzon.cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp2
3 files changed, 6 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 1eb9aeeb172..c481a3b320d 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Mon Dec 13 13:50:13 1999 Krishnakumar Elakkara Pathayapura <krish@danzon.cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+ * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+ fixed template instantiation
+
Mon Dec 13 11:36:11 1999 Ossama Othman <othman@cs.wustl.edu>
* orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (server_is_running):
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 80fcb6cbcfe..ab7328c3107 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_Hash<DsLogAdmin::LogId>;
template class ACE_Equal_To<DsLogAdmin::LogId>;
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -122,7 +121,6 @@ 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_Hash<DsLogAdmin::LogId>
#pragma instantiate ACE_Equal_To<DsLogAdmin::LogId>
#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index fe521ecb0d0..818285e5d5a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -165,7 +165,6 @@ template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::RecordId, DsLogAdmin::L
template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>;
template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>,
ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>;
-template class ACE_Hash<DsLogAdmin::RecordId>;
template class ACE_Equal_To<DsLogAdmin::RecordId>;
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -182,7 +181,6 @@ ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>
#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>
#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>,
ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash<DsLogAdmin::RecordId>
#pragma instantiate ACE_Equal_To<DsLogAdmin::RecordId>
#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */