diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-12 22:41:47 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-12 22:41:47 +0000 |
| commit | 9580d3fef7f11b73955d49cfdd98b44643fd3c0e (patch) | |
| tree | b6797cbf24955f0ba532414634d2587954ee6e33 | |
| parent | 2654f9689cf6d8f6bd300205333a5f0bcb9966a2 (diff) | |
| download | ATCD-9580d3fef7f11b73955d49cfdd98b44643fd3c0e.tar.gz | |
ChangeLogTag:Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/OS.cpp | 8 |
5 files changed, 29 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 2e793b84ca7..a729fa91482 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp (ACE_OS_GUARD): + Use explicit names for the OS guards, otherwise the SGI compiler + (7.30 + several patches) crashes. Thanks to Philip Miller + <pwmiller@sarnoff.com> for reporting the problem and providing + the patch. + Thu Oct 12 12:15:23 2000 Angelo <corsaro@cs.wustl.edu> * ACE version 5.1.10 released. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 2e793b84ca7..a729fa91482 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp (ACE_OS_GUARD): + Use explicit names for the OS guards, otherwise the SGI compiler + (7.30 + several patches) crashes. Thanks to Philip Miller + <pwmiller@sarnoff.com> for reporting the problem and providing + the patch. + Thu Oct 12 12:15:23 2000 Angelo <corsaro@cs.wustl.edu> * ACE version 5.1.10 released. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2e793b84ca7..a729fa91482 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Thu Oct 12 15:40:51 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.cpp (ACE_OS_GUARD): + Use explicit names for the OS guards, otherwise the SGI compiler + (7.30 + several patches) crashes. Thanks to Philip Miller + <pwmiller@sarnoff.com> for reporting the problem and providing + the patch. + Thu Oct 12 12:15:23 2000 Angelo <corsaro@cs.wustl.edu> * ACE version 5.1.10 released. @@ -1063,6 +1063,7 @@ Roger Beck <roger_beck@royalsun.com.au> Trueman Bill <truemanbill@yahoo.com> Harold Bien <harold_bien@yahoo.com> Mateu Batle <mbatle@iname.com> +Philip Miller <pwmiller@sarnoff.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson. Paul devised the recursive Makefile scheme that diff --git a/ace/OS.cpp b/ace/OS.cpp index dd19613e2e3..6e631a8f734 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -176,17 +176,17 @@ ACE_OS_Recursive_Thread_Mutex_Guard::~ACE_OS_Recursive_Thread_Mutex_Guard () } #define ACE_OS_GUARD \ - ACE_OS_Thread_Mutex_Guard (*(ACE_thread_mutex_t *) \ + ACE_OS_Thread_Mutex_Guard ace_os_guard__ (*(ACE_thread_mutex_t *) \ ACE_OS_Object_Manager::preallocated_object[ \ ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]); #define ACE_TSS_CLEANUP_GUARD \ - ACE_OS_Recursive_Thread_Mutex_Guard (*(ACE_recursive_thread_mutex_t *) \ + ACE_OS_Recursive_Thread_Mutex_Guard ace_tss_cleanup_guard__ (*(ACE_recursive_thread_mutex_t *) \ ACE_OS_Object_Manager::preallocated_object[ \ ACE_OS_Object_Manager::ACE_TSS_CLEANUP_LOCK]); #define ACE_TSS_BASE_GUARD \ - ACE_OS_Recursive_Thread_Mutex_Guard (*(ACE_recursive_thread_mutex_t *) \ + ACE_OS_Recursive_Thread_Mutex_Guard ace_tss_base_guard__ (*(ACE_recursive_thread_mutex_t *) \ ACE_OS_Object_Manager::preallocated_object[ \ ACE_OS_Object_Manager::ACE_TSS_BASE_LOCK]); @@ -5362,7 +5362,7 @@ ACE_OS::open (const wchar_t *filename, shared_mode |= FILE_SHARE_DELETE; #endif /* ACE_HAS_WINCE */ - ACE_HANDLE h = ::CreateFileW (filename, + ACE_HANDLE h = ::CreateFileW (filename, access, shared_mode, ACE_OS::default_win32_security_attributes (sa), |