diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-12 20:33:02 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-09-12 20:33:02 +0000 |
| commit | 7093e58c54a99255ed7e7059b3f737300bbbe79d (patch) | |
| tree | f755adbfde33eec600a140701e200bc9302873ed /ace | |
| parent | 729f22b4b1fa66a56af7f7403fd10267d0521645 (diff) | |
| download | ATCD-7093e58c54a99255ed7e7059b3f737300bbbe79d.tar.gz | |
ChangeLogTag: Tue Sep 12 15:15:54 2000 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/ACE_export.h | 6 | ||||
| -rw-r--r-- | ace/Timeprobe.h | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/ace/ACE_export.h b/ace/ACE_export.h index 8a6bf6b8877..e9c388c793f 100644 --- a/ace/ACE_export.h +++ b/ace/ACE_export.h @@ -4,7 +4,7 @@ // This file is generated automatically by // generate_export_file.pl // ------------------------------ -#if !defined (ACE_EXPORT_H) +#ifndef ACE_EXPORT_H #define ACE_EXPORT_H #include "ace/config-all.h" @@ -18,17 +18,21 @@ # if defined (ACE_BUILD_DLL) # define ACE_Export ACE_Proper_Export_Flag # define ACE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) # else # define ACE_Export ACE_Proper_Import_Flag # define ACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) # endif /* ACE_BUILD_DLL */ # else # define ACE_Export # define ACE_SINGLETON_DECLARATION(T) +# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) # endif /* ! ACE_HAS_DLL == 1 */ #else # define ACE_Export # define ACE_SINGLETON_DECLARATION(T) +# define ACE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* ACE_HAS_DLL */ #endif /* ACE_EXPORT_H */ diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 5070a863a14..92caac950cc 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -131,15 +131,11 @@ typedef ACE_Timeprobe<ACE_TIMEPROBE_MUTEX> // 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 */ #if defined (_MSC_VER) @@ -147,7 +143,12 @@ typedef ACE_Singleton<ACE_TIMEPROBE_WITH_LOCKING, ACE_SYNCH_MUTEX> #pragma warning(disable:4231) #endif /* _MSC_VER */ -ACE_SINGLETON_DECLARATION (ACE_TIMEPROBE_SINGLETON_DEFINE); +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); #if defined (_MSC_VER) // Default back the warning of using Microsoft Extension. |