[Boost-commit] svn:boost r86299 - in branches/release/boost/lockfree: . detail

Subject: [Boost-commit] svn:boost r86299 - in branches/release/boost/lockfree: . detail
From: tim_at_[hidden]
Date: 2013-10-14 09:20:35

Author: timblechmann
Date: 2013-10-14 09:20:34 EDT (Mon, 14 Oct 2013)
New Revision: 86299
URL: http://svn.boost.org/trac/boost/changeset/86299

Log:
lockfree: merge fixes from trunk

Properties modified: 
   branches/release/boost/lockfree/   (props changed)
Text files modified: 
   branches/release/boost/lockfree/detail/freelist.hpp |    11 +++++++++++                             
   branches/release/boost/lockfree/queue.hpp           |    10 ++++++++++                              
   2 files changed, 21 insertions(+), 0 deletions(-)

Modified: branches/release/boost/lockfree/detail/freelist.hpp
==============================================================================
--- branches/release/boost/lockfree/detail/freelist.hpp	Mon Oct 14 08:40:08 2013	(r86298)
+++ branches/release/boost/lockfree/detail/freelist.hpp	2013-10-14 09:20:34 EDT (Mon, 14 Oct 2013)	(r86299)
@@ -22,6 +22,12 @@
 #include <boost/lockfree/detail/parameter.hpp>
 #include <boost/lockfree/detail/tagged_ptr.hpp>
 
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4100) // unreferenced formal parameter
+#pragma warning(disable: 4127) // conditional expression is constant
+#endif
+
 namespace boost    {
 namespace lockfree {
 namespace detail   {
@@ -634,4 +640,9 @@
 } /* namespace lockfree */
 } /* namespace boost */
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+
 #endif /* BOOST_LOCKFREE_FREELIST_HPP_INCLUDED */

Modified: branches/release/boost/lockfree/queue.hpp
==============================================================================
--- branches/release/boost/lockfree/queue.hpp	Mon Oct 14 08:40:08 2013	(r86298)
+++ branches/release/boost/lockfree/queue.hpp	2013-10-14 09:20:34 EDT (Mon, 14 Oct 2013)	(r86299)
@@ -25,6 +25,12 @@
 #include <boost/lockfree/detail/parameter.hpp>
 #include <boost/lockfree/detail/tagged_ptr.hpp>
 
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4324) // structure was padded due to __declspec(align())
+#endif
+
+
 namespace boost    {
 namespace lockfree {
 namespace detail   {
@@ -541,4 +547,8 @@
 } /* namespace lockfree */
 } /* namespace boost */
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
 #endif /* BOOST_LOCKFREE_FIFO_HPP_INCLUDED */