summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-06-25 07:56:02 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-06-25 07:56:02 +0000
commit4a2a7990fb266db206d92db761a91ff949bb8f1d (patch)
tree6ef89634c54e4cde19415d96cdf6a46c1f61199c
parent60336e50774b0d31dc451fcdf930c008d2acfb58 (diff)
downloadATCD-4a2a7990fb266db206d92db761a91ff949bb8f1d.tar.gz
ChangeLogTag: Fri Jun 25 07:56:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/Timeprobe.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/ace/Timeprobe.cpp b/ace/Timeprobe.cpp
index 691d4cdb9b8..9fa83321885 100644
--- a/ace/Timeprobe.cpp
+++ b/ace/Timeprobe.cpp
@@ -7,25 +7,27 @@ ACE_RCSID(ace, Timeprobe, "$Id$")
#if defined (ACE_COMPILE_TIMEPROBES)
#include "ace/Timeprobe.h"
+#include "ace/Mutex.h"
+#include "ace/Null_Mutex.h"
#if !defined (__ACE_INLINE__)
#include "ace/Timeprobe.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Timeprobe<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR>;
-template class ACE_Function_Timeprobe<ACE_Timeprobe<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR> >;
+template class ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR>;
+template class ACE_Function_Timeprobe<ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR> >;
template class ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>;
template class ACE_Unbounded_Set<ACE_Event_Descriptions>;
template class ACE_Node<ACE_Event_Descriptions>;
-template class ACE_Timeprobe<ACE_Thread_Mutex, ACE_New_Allocator>;
+template class ACE_Timeprobe_Ex<ACE_Thread_Mutex, ACE_New_Allocator>;
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Timeprobe<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR>
-#pragma instantiate ACE_Function_Timeprobe<ACE_Timeprobe<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR> >
+#pragma instantiate ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR>
+#pragma instantiate ACE_Function_Timeprobe<ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX,ACE_TIMEPROBE_ALLOCATOR> >
#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>
#pragma instantiate ACE_Unbounded_Set<ACE_Event_Descriptions>
#pragma instantiate ACE_Node<ACE_Event_Descriptions>
-#pragma instantiate ACE_Timeprobe<ACE_Thread_Mutex, ACE_New_Allocator>
+#pragma instantiate ACE_Timeprobe_Ex<ACE_Thread_Mutex, ACE_New_Allocator>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
# if defined (ACE_TSS_TIMEPROBES)