|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81908 - in trunk: boost/heap boost/heap/detail libs/heap/doc
From: tim_at_[hidden]
Date: 2012-12-13 13:48:18
Author: timblechmann
Date: 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
New Revision: 81908
URL: http://svn.boost.org/trac/boost/changeset/81908
Log:
heap: use new c++11 feature tests (remaining instances)
Text files modified:
trunk/boost/heap/binomial_heap.hpp | 2 +-
trunk/boost/heap/d_ary_heap.hpp | 4 ++--
trunk/boost/heap/detail/heap_node.hpp | 6 +++---
trunk/boost/heap/detail/mutable_heap.hpp | 2 +-
trunk/boost/heap/detail/stable_heap.hpp | 2 +-
trunk/boost/heap/fibonacci_heap.hpp | 2 +-
trunk/boost/heap/pairing_heap.hpp | 2 +-
trunk/boost/heap/priority_queue.hpp | 6 +++---
trunk/boost/heap/skew_heap.hpp | 8 ++++----
trunk/libs/heap/doc/Jamfile.v2 | 1 -
10 files changed, 17 insertions(+), 18 deletions(-)
Modified: trunk/boost/heap/binomial_heap.hpp
==============================================================================
--- trunk/boost/heap/binomial_heap.hpp (original)
+++ trunk/boost/heap/binomial_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -354,7 +354,7 @@
return handle_type(n);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_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. Returns handle to element.
*
Modified: trunk/boost/heap/d_ary_heap.hpp
==============================================================================
--- trunk/boost/heap/d_ary_heap.hpp (original)
+++ trunk/boost/heap/d_ary_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -213,7 +213,7 @@
siftup(q_.size() - 1);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
void emplace(Args&&... args)
{
@@ -587,7 +587,7 @@
return super_t::push(v);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
/// \copydoc boost::heap::priority_queue::emplace
template <class... Args>
typename mpl::if_c<is_mutable, handle_type, void>::type emplace(Args&&... args)
Modified: trunk/boost/heap/detail/heap_node.hpp
==============================================================================
--- trunk/boost/heap/detail/heap_node.hpp (original)
+++ trunk/boost/heap/detail/heap_node.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -171,7 +171,7 @@
value(v)
{}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
heap_node(Args&&... args):
value(std::forward<Args>(args)...)
@@ -230,7 +230,7 @@
super_t(v), parent(NULL)
{}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
parent_pointing_heap_node(Args&&... args):
super_t(std::forward<Args>(args)...), parent(NULL)
@@ -310,7 +310,7 @@
super_t(v), mark(false)
{}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
marked_heap_node(Args&&... args):
super_t(std::forward<Args>(args)...), mark(false)
Modified: trunk/boost/heap/detail/mutable_heap.hpp
==============================================================================
--- trunk/boost/heap/detail/mutable_heap.hpp (original)
+++ trunk/boost/heap/detail/mutable_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -339,7 +339,7 @@
return handle_type(ret);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
handle_type emplace(Args&&... args)
{
Modified: trunk/boost/heap/detail/stable_heap.hpp
==============================================================================
--- trunk/boost/heap/detail/stable_heap.hpp (original)
+++ trunk/boost/heap/detail/stable_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -359,7 +359,7 @@
return std::make_pair(val, count);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
internal_type make_node(Args&&... args)
{
Modified: trunk/boost/heap/fibonacci_heap.hpp
==============================================================================
--- trunk/boost/heap/fibonacci_heap.hpp (original)
+++ trunk/boost/heap/fibonacci_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -359,7 +359,7 @@
return handle_type(n);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_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. Returns handle to element.
*
Modified: trunk/boost/heap/pairing_heap.hpp
==============================================================================
--- trunk/boost/heap/pairing_heap.hpp (original)
+++ trunk/boost/heap/pairing_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -357,7 +357,7 @@
return handle_type(n);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_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. Returns handle to element.
*
Modified: trunk/boost/heap/priority_queue.hpp
==============================================================================
--- trunk/boost/heap/priority_queue.hpp (original)
+++ trunk/boost/heap/priority_queue.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -129,7 +129,7 @@
*
* \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_))
@@ -140,7 +140,7 @@
*
* \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)
{
@@ -242,7 +242,7 @@
std::push_heap(q_.begin(), q_.end(), static_cast<super_t const &>(*this));
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_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.
*
Modified: trunk/boost/heap/skew_heap.hpp
==============================================================================
--- trunk/boost/heap/skew_heap.hpp (original)
+++ trunk/boost/heap/skew_heap.hpp 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -423,7 +423,7 @@
return push_helper::push(this, v);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_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.
*
@@ -762,7 +762,7 @@
self->push_internal(v);
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
static void emplace(skew_heap * self, Args&&... args)
{
@@ -778,7 +778,7 @@
return handle_type(self->push_internal(v));
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
static handle_type emplace(skew_heap * self, Args&&... args)
{
@@ -798,7 +798,7 @@
return n;
}
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
node_pointer emplace_internal(Args&&... args)
{
Modified: trunk/libs/heap/doc/Jamfile.v2
==============================================================================
--- trunk/libs/heap/doc/Jamfile.v2 (original)
+++ trunk/libs/heap/doc/Jamfile.v2 2012-12-13 13:48:17 EST (Thu, 13 Dec 2012)
@@ -12,7 +12,6 @@
#<doxygen:param>EXTRACT_ALL=YES
<doxygen:param>"PREDEFINED=\"BOOST_DOXYGEN_INVOKED\" \\
\"BOOST_DEDUCED_TYPENAME=typename\" \\
- \"BOOST_HAS_RVALUE_REFS\" \\
"
<doxygen:param>HIDE_UNDOC_MEMBERS=YES
<doxygen:param>HIDE_UNDOC_CLASSES=YES
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