[Boost-commit] svn:boost r84818 - in branches/release/libs/log: . src

Subject: [Boost-commit] svn:boost r84818 - in branches/release/libs/log: . src
From: andrey.semashev_at_[hidden]
Date: 2013-06-17 17:20:23

Author: andysem
Date: 2013-06-17 17:20:22 EDT (Mon, 17 Jun 2013)
New Revision: 84818
URL: http://svn.boost.org/trac/boost/changeset/84818

Log:
Merged changes from trunk. Fixes #8703.

Properties modified: 
   branches/release/libs/log/   (props changed)
Text files modified: 
   branches/release/libs/log/src/threadsafe_queue.cpp |     3 +++                                     
   1 files changed, 3 insertions(+), 0 deletions(-)

Modified: branches/release/libs/log/src/threadsafe_queue.cpp
==============================================================================
--- branches/release/libs/log/src/threadsafe_queue.cpp	Mon Jun 17 17:02:19 2013	(r84817)
+++ branches/release/libs/log/src/threadsafe_queue.cpp	2013-06-17 17:20:22 EDT (Mon, 17 Jun 2013)	(r84818)
@@ -53,8 +53,11 @@
 #define BOOST_LOG_HAS_POSIX_MEMALIGN 1
 #endif
 #elif (defined(_POSIX_VERSION) && (_POSIX_VERSION >= 200112L)) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))
+// Solaris 10 does not have posix_memalign. Solaris 11 and later seem to have it.
+#if !(defined(sun) || defined(__sun)) || defined(__SunOS_5_11) || defined(__SunOS_5_12)
 #define BOOST_LOG_HAS_POSIX_MEMALIGN 1
 #endif
+#endif
 
 #if defined(BOOST_WINDOWS)
 #include <malloc.h> // _aligned_malloc, _aligned_free