|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85649 - in trunk/boost/lockfree: . detail
From: tim_at_[hidden]
Date: 2013-09-11 11:01:36
Author: timblechmann
Date: 2013-09-11 11:01:36 EDT (Wed, 11 Sep 2013)
New Revision: 85649
URL: http://svn.boost.org/trac/boost/changeset/85649
Log:
lockfree: silence msvc warnings
Text files modified:
trunk/boost/lockfree/detail/freelist.hpp | 11 +++++++++++
trunk/boost/lockfree/queue.hpp | 10 ++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
Modified: trunk/boost/lockfree/detail/freelist.hpp
==============================================================================
--- trunk/boost/lockfree/detail/freelist.hpp Wed Sep 11 00:42:13 2013 (r85648)
+++ trunk/boost/lockfree/detail/freelist.hpp 2013-09-11 11:01:36 EDT (Wed, 11 Sep 2013) (r85649)
@@ -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: trunk/boost/lockfree/queue.hpp
==============================================================================
--- trunk/boost/lockfree/queue.hpp Wed Sep 11 00:42:13 2013 (r85648)
+++ trunk/boost/lockfree/queue.hpp 2013-09-11 11:01:36 EDT (Wed, 11 Sep 2013) (r85649)
@@ -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 */
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk