diff options
Diffstat (limited to 'ace/Timeprobe.h')
| -rw-r--r-- | ace/Timeprobe.h | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 0f7da17decd..494f67d2979 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -38,7 +38,7 @@ #ifndef ACE_TIMEPROBE_H #define ACE_TIMEPROBE_H #include "ace/pre.h" - +#include "ace/ACE_export.h" #include "ace/OS.h" #include "ace/Malloc_Allocator.h" @@ -46,12 +46,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_ENABLE_TIMEPROBES) - #if !defined (ACE_COMPILE_TIMEPROBES) - #define ACE_COMPILE_TIMEPROBES - #endif /* ACE_COMPILE_TIMEPROBES */ -#endif /* ACE_ENABLE_TIMEPROBES */ - #if defined (ACE_COMPILE_TIMEPROBES) /** @@ -133,24 +127,21 @@ typedef ACE_Timeprobe_Ex<ACE_TIMEPROBE_MUTEX, ACE_TIMEPROBE_ALLOCATOR> // in thread specific storage. This allows multiple threads to use // their own instance of ACE_Timerprobe, without interfering with each // other. + # if defined (ACE_TSS_TIMEPROBES) -#define ACE_TIMEPROBE_SINGLETON_DEFINE \ - ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX>; -typedef ACE_TSS_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_NULL_MUTEX> - ACE_TIMEPROBE_SINGLETON; +# define ACE_TIMEPROBE_SINGLETON_TYPE ACE_TSS_Singleton +# define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_NULL_MUTEX # else /* ACE_TSS_TIMEPROBES */ -#define ACE_TIMEPROBE_SINGLETON_DEFINE \ - ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX>; -typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX> - ACE_TIMEPROBE_SINGLETON; +# define ACE_TIMEPROBE_SINGLETON_TYPE ACE_Singleton +# define ACE_TIMEPROBE_SINGLETON_LOCK_TYPE ACE_SYNCH_MUTEX # endif /* ACE_TSS_TIMEPROBES */ -//typedef ACE_TIMEPROBE_SINGLETON_TYPE<ACE_TIMEPROBE_WITH_LOCKING, ACE_TIMEPROBE_SINGLETON_LOCK_TYPE> -// ACE_TIMEPROBE_SINGLETON; +typedef ACE_TIMEPROBE_SINGLETON_TYPE<ACE_TIMEPROBE_WITH_LOCKING, ACE_TIMEPROBE_SINGLETON_LOCK_TYPE> + ACE_TIMEPROBE_SINGLETON; ACE_SINGLETON_DECLARE (ACE_TIMEPROBE_SINGLETON_TYPE, \ - ACE_TIMEPROBE_WITH_LOCKING, \ - ACE_TIMEPROBE_SINGLETON_LOCK_TYPE); + ACE_TIMEPROBE_WITH_LOCKING, \ + ACE_TIMEPROBE_SINGLETON_LOCK_TYPE); #endif /* ACE_COMPILE_TIMEPROBES */ |