diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2006-11-23 17:08:22 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2006-11-23 17:08:22 +0000 |
| commit | 31ba56cec3b0f9eb291b05ef23a3ecd83c9b7238 (patch) | |
| tree | d95176cf1fcd8e75773ab7237e56f75f8ca5174c | |
| parent | dc01f4e7fe486a271528c81abe95e645ebfded04 (diff) | |
| download | ATCD-31ba56cec3b0f9eb291b05ef23a3ecd83c9b7238.tar.gz | |
ChangeLogTag: Thu Nov 23 17:06:17 UTC 2006 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/OS_Errno.cpp | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_Errno.h | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1baba868ea6..75d56dc81e3 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 23 17:06:17 UTC 2006 Simon McQueen <sm@prismtech.com> + + * ace/OS_Errno.h: + * ace/OS_Errno.cpp: + + Fix compile errors with g++ on Solaris with NDEBUG. + Thu Nov 23 14:09:17 UTC 2006 Steve Huston <shuston@riverace.com> * include/makeinclude/rules.lib.GNU: Corrected error introduced by @@ -95,7 +102,7 @@ Wed Nov 22 19:52:23 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> Wed Nov 22 18:27:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: + * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: Regenerated. diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp index 25266ae5c55..6f9905cad1f 100644 --- a/ACE/ace/OS_Errno.cpp +++ b/ACE/ace/OS_Errno.cpp @@ -6,9 +6,10 @@ ACE_RCSID(ace, OS_Errno, "$Id$") // Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. +// deadlocks during static initialization. On non debug builds it +// causes compilation errors. #if !defined (ACE_HAS_INLINED_OSCALLS) || \ - (defined (__GNUG__) && defined (__sun__) && !defined (ACE_NDEBUG)) + (defined (__GNUG__) && defined (__sun__)) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index d67868631c1..077aff14ff8 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -86,9 +86,10 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL // Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. +// deadlocks during static initialization. On non debug builds it +// causes compilation errors. #if defined (ACE_HAS_INLINED_OSCALLS) && \ - (!defined (__GNUG__) || !defined (__sun__) || defined (ACE_NDEBUG)) + (!defined (__GNUG__) || !defined (__sun__)) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ |