diff options
| -rw-r--r-- | ace/Local_Tokens.h | 2 | ||||
| -rw-r--r-- | ace/OS.h | 4 | ||||
| -rw-r--r-- | ace/Synch.h | 10 | ||||
| -rw-r--r-- | ace/Synch_T.h | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h index acf38160ddf..cd86d10e9b2 100644 --- a/ace/Local_Tokens.h +++ b/ace/Local_Tokens.h @@ -61,7 +61,7 @@ public: typedef ACE_Thread_Mutex MUTEX; typedef ACE_Thread_Mutex_Guard GUARD; #else - typedef ACE_Null_Condition_Mutex COND_VAR; + typedef ACE_Null_Condition COND_VAR; typedef ACE_Null_Mutex MUTEX; typedef ACE_Null_Mutex_Guard GUARD; #endif /* ACE_HAS_THREADS */ @@ -805,8 +805,8 @@ private: // Handle ACE_Message_Queue. #if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_SYNCH_1 class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_SEMAPHORE_T -#define ACE_SYNCH_2 _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_SEMAPHORE_T +#define ACE_SYNCH_1 class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T class _ACE_SYNCH_SEMAPHORE_T +#define ACE_SYNCH_2 _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T _ACE_SYNCH_SEMAPHORE_T #else #define ACE_SYNCH_1 class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T #define ACE_SYNCH_2 _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T diff --git a/ace/Synch.h b/ace/Synch.h index 7a4800259b1..9621a3a2e1f 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -558,16 +558,16 @@ public: // Declare the dynamic allocation hooks. }; -class ACE_Export ACE_Null_Condition_Mutex +class ACE_Export ACE_Null_Condition // = TITLE // Implement a do nothing <ACE_Condition> variable wrapper, i.e., // all methods are no ops. This class is necessary since some // C++ compilers are *very* lame... { public: - ACE_Null_Condition_Mutex (ACE_Null_Mutex &m, int = 0, + ACE_Null_Condition (ACE_Null_Mutex &m, int = 0, LPCTSTR = 0, void * = 0): mutex_ (m) {} - ~ACE_Null_Condition_Mutex (void) {} + ~ACE_Null_Condition (void) {} int remove (void) { return 0; } int wait (ACE_Time_Value * = 0) { errno = ETIME; return -1; } int signal (void) { return 0; } @@ -585,8 +585,8 @@ protected: private: // = Prevent assignment and initialization. - void operator= (const ACE_Null_Condition_Mutex &); - ACE_Null_Condition_Mutex (const ACE_Null_Condition_Mutex &c): mutex_ + void operator= (const ACE_Null_Condition &); + ACE_Null_Condition (const ACE_Null_Condition &c): mutex_ (c.mutex_) {} }; diff --git a/ace/Synch_T.h b/ace/Synch_T.h index 3671862ad17..66e3b98d3c1 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -288,7 +288,7 @@ public: typedef ACE_Null_Mutex RW_MUTEX; // "Do-nothing" RW Mutex type. - typedef ACE_Null_Condition_Mutex CONDITION; + typedef ACE_Null_Condition CONDITION; // "Do-nothing" Condition type. typedef ACE_Null_Mutex SEMAPHORE; @@ -296,9 +296,9 @@ public: }; #else /* Necessary to support broken cfront-based C++ compilers... */ #if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Mutex, +#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition, ACE_Null_Mutex #else -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition_Mutex +#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition #endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ @@ -737,7 +737,7 @@ public: #define ACE_SYNCH_SEMAPHORE ACE_MT_SYNCH::SEMAPHORE #else /* Necessary to support broken cfront-based C++ compilers... */ #if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Thread_Semaphore +#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex, ACE_Thread_Semaphore #else #define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex #endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ |