diff DEPENDENCIES/generic/include/boost/lockfree/queue.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

--- a/DEPENDENCIES/generic/include/boost/lockfree/queue.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/lockfree/queue.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -12,9 +12,6 @@
 #define BOOST_LOCKFREE_FIFO_HPP_INCLUDED
 
 #include <boost/assert.hpp>
-#ifdef BOOST_NO_CXX11_DELETED_FUNCTIONS
-#include <boost/noncopyable.hpp>
-#endif
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/has_trivial_assign.hpp>
 #include <boost/type_traits/has_trivial_destructor.hpp>
@@ -25,6 +22,11 @@
 #include <boost/lockfree/detail/parameter.hpp>
 #include <boost/lockfree/detail/tagged_ptr.hpp>
 
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable: 4324) // structure was padded due to __declspec(align())
@@ -76,9 +78,6 @@
 template <typename T, ...Options>
 #endif
 class queue
-#ifdef BOOST_NO_CXX11_DELETED_FUNCTIONS
-    : boost::noncopyable
-#endif
 {
 private:
 #ifndef BOOST_DOXYGEN_INVOKED
@@ -145,11 +144,8 @@
 
 #endif
 
-#ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
-    queue(queue const &) = delete;
-    queue(queue &&)      = delete;
-    const queue& operator=( const queue& ) = delete;
-#endif
+    BOOST_DELETED_FUNCTION(queue(queue const&))
+    BOOST_DELETED_FUNCTION(queue& operator= (queue const&))
 
 public:
     typedef T value_type;
@@ -253,7 +249,7 @@
      * \note The result is only accurate, if no other thread modifies the queue. Therefore it is rarely practical to use this
      *       value in program logic.
      * */
-    bool empty(void)
+    bool empty(void) const
     {
         return pool.get_handle(head_.load()) == pool.get_handle(tail_.load());
     }