diff options
Diffstat (limited to 'boost/heap/priority_queue.hpp')
| -rw-r--r-- | boost/heap/priority_queue.hpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/boost/heap/priority_queue.hpp b/boost/heap/priority_queue.hpp index 05d79fd875..45f2151739 100644 --- a/boost/heap/priority_queue.hpp +++ b/boost/heap/priority_queue.hpp @@ -11,6 +11,7 @@ #include <algorithm> #include <queue> +#include <utility> #include <vector> #include <boost/assert.hpp> @@ -18,6 +19,11 @@ #include <boost/heap/detail/heap_comparison.hpp> #include <boost/heap/detail/stable_heap.hpp> +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif + + namespace boost { namespace heap { namespace detail { @@ -122,13 +128,13 @@ public: super_t(rhs), q_(rhs.q_) {} -#ifdef BOOST_HAS_RVALUE_REFS +#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES /** * \b Effects: C++11-style move constructor. * * \b Complexity: Constant. * - * \b Note: Only available, if BOOST_HAS_RVALUE_REFS is defined + * \b Note: Only available, if BOOST_NO_CXX11_RVALUE_REFERENCES is not defined * */ priority_queue(priority_queue && rhs): super_t(std::move(rhs)), q_(std::move(rhs.q_)) @@ -139,7 +145,7 @@ public: * * \b Complexity: Constant. * - * \b Note: Only available, if BOOST_HAS_RVALUE_REFS is defined + * \b Note: Only available, if BOOST_NO_CXX11_RVALUE_REFERENCES is not defined * */ priority_queue & operator=(priority_queue && rhs) { @@ -241,7 +247,7 @@ public: std::push_heap(q_.begin(), q_.end(), static_cast<super_t const &>(*this)); } -#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_VARIADIC_TEMPLATES) +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) /** * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place. * |