diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-24 02:55:10 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-24 02:55:10 +0000 |
| commit | 836a18342f99473db2828c519450435b09716598 (patch) | |
| tree | 10ea16c9a90b73d76588c12ddf982fbe45905a40 | |
| parent | 90a0929e0c06dc72c5a7248a01aab7e619cb24ab (diff) | |
| download | ATCD-836a18342f99473db2828c519450435b09716598.tar.gz | |
ChangeLogTag:Tue Jul 23 21:46:54 2002 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | ace/Process_Mutex.cpp | 6 | ||||
| -rw-r--r-- | ace/Process_Mutex.h | 2 |
4 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f21f2ca1884..23fc069b289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jul 23 21:46:54 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Process_Mutex.h: + * ace/Process_Mutex.cpp: Disallowed anonymous Process_Mutex by + invoking this->unique_name() to create a temporary name if + there's no mutex name passed to the constructor. Thanks John + Michael Zorko <j.zorko@att.net> for reporting this problem on + Mac OSX and submitting the patch. + Tue Jul 23 13:08:27 2002 Steve Huston <shuston@riverace.com> * ace/Log_Msg.{h cpp} (log_hexdump): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f21f2ca1884..23fc069b289 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Tue Jul 23 21:46:54 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Process_Mutex.h: + * ace/Process_Mutex.cpp: Disallowed anonymous Process_Mutex by + invoking this->unique_name() to create a temporary name if + there's no mutex name passed to the constructor. Thanks John + Michael Zorko <j.zorko@att.net> for reporting this problem on + Mac OSX and submitting the patch. + Tue Jul 23 13:08:27 2002 Steve Huston <shuston@riverace.com> * ace/Log_Msg.{h cpp} (log_hexdump): diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp index b8dd17ed7a4..80d5cbe2493 100644 --- a/ace/Process_Mutex.cpp +++ b/ace/Process_Mutex.cpp @@ -22,7 +22,6 @@ ACE_Process_Mutex::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } -#if defined (_ACE_USE_SV_SEM) const ACE_TCHAR * ACE_Process_Mutex::unique_name (void) { @@ -32,13 +31,12 @@ ACE_Process_Mutex::unique_name (void) ACE::unique_name (this, this->name_, ACE_UNIQUE_NAME_LEN); return this->name_; } -#endif /* _ACE_USE_SV_SEM */ ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg) #if defined (_ACE_USE_SV_SEM) : lock_ (name ? ACE_TEXT_CHAR_TO_TCHAR (name) :this->unique_name ()) #else - : lock_ (USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (name), (ACE_mutexattr_t *) arg) + : lock_ (USYNC_PROCESS, name ? ACE_TEXT_CHAR_TO_TCHAR (name) : this->unique_name (), (ACE_mutexattr_t *) arg) #endif /* _ACE_USE_SV_SEM */ { #if defined (_ACE_USE_SV_SEM) @@ -51,7 +49,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name, void *arg) #if defined (_ACE_USE_SV_SEM) : lock_ (name ? ACE_TEXT_WCHAR_TO_TCHAR (name): this->unique_name ()) #else - : lock_ (USYNC_PROCESS, ACE_TEXT_WCHAR_TO_TCHAR (name), (ACE_mutexattr_t *) arg) + : lock_ (USYNC_PROCESS, name ? ACE_TEXT_WCHAR_TO_TCHAR (name) : this->unique_name (), (ACE_mutexattr_t *) arg) #endif /* _ACE_USE_SV_SEM */ { #if defined (_ACE_USE_SV_SEM) diff --git a/ace/Process_Mutex.h b/ace/Process_Mutex.h index 8167570f0aa..35dd63e197a 100644 --- a/ace/Process_Mutex.h +++ b/ace/Process_Mutex.h @@ -171,7 +171,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: -#if defined (_ACE_USE_SV_SEM) /// If the user does not provide a name we generate a unique name in /// this buffer. ACE_TCHAR name_[ACE_UNIQUE_NAME_LEN]; @@ -179,6 +178,7 @@ private: /// Create and return the unique name. const ACE_TCHAR *unique_name (void); +#if defined (_ACE_USE_SV_SEM) /// We need this to get the right semantics... ACE_SV_Semaphore_Complex lock_; #else |