|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81943 - in branches/release: boost/heap boost/heap/detail libs/heap libs/heap/doc libs/heap/test
From: tim_at_[hidden]
Date: 2012-12-14 12:15:36
Author: timblechmann
Date: 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
New Revision: 81943
URL: http://svn.boost.org/trac/boost/changeset/81943
Log:
heap: merge changes from trunk
Properties modified:
branches/release/boost/heap/ (props changed)
branches/release/libs/heap/ (props changed)
Text files modified:
branches/release/boost/heap/binomial_heap.hpp | 6 +++---
branches/release/boost/heap/d_ary_heap.hpp | 8 ++++----
branches/release/boost/heap/detail/heap_node.hpp | 6 +++---
branches/release/boost/heap/detail/mutable_heap.hpp | 4 ++--
branches/release/boost/heap/detail/stable_heap.hpp | 12 ++++++------
branches/release/boost/heap/fibonacci_heap.hpp | 6 +++---
branches/release/boost/heap/pairing_heap.hpp | 6 +++---
branches/release/boost/heap/priority_queue.hpp | 8 ++++----
branches/release/boost/heap/skew_heap.hpp | 14 +++++++-------
branches/release/libs/heap/doc/Jamfile.v2 | 1 -
branches/release/libs/heap/test/common_heap_tests.hpp | 8 ++++----
11 files changed, 39 insertions(+), 40 deletions(-)
Modified: branches/release/boost/heap/binomial_heap.hpp
==============================================================================
--- branches/release/boost/heap/binomial_heap.hpp (original)
+++ branches/release/boost/heap/binomial_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -62,7 +62,7 @@
base_type(arg)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
type(type const & rhs):
base_type(rhs), allocator_type(rhs)
{}
@@ -246,7 +246,7 @@
return *this;
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
/// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
binomial_heap(binomial_heap && rhs):
super_t(std::move(rhs)), top_element(rhs.top_element)
@@ -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: branches/release/boost/heap/d_ary_heap.hpp
==============================================================================
--- branches/release/boost/heap/d_ary_heap.hpp (original)
+++ branches/release/boost/heap/d_ary_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -155,7 +155,7 @@
super_t(rhs), q_(rhs.q_)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
d_ary_heap(d_ary_heap && rhs):
super_t(std::move(rhs)), q_(std::move(rhs.q_))
{}
@@ -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)
{
@@ -524,7 +524,7 @@
super_t(rhs)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
/// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
d_ary_heap(d_ary_heap && rhs):
super_t(std::move(rhs))
@@ -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: branches/release/boost/heap/detail/heap_node.hpp
==============================================================================
--- branches/release/boost/heap/detail/heap_node.hpp (original)
+++ branches/release/boost/heap/detail/heap_node.hpp 2012-12-14 12:15:35 EST (Fri, 14 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: branches/release/boost/heap/detail/mutable_heap.hpp
==============================================================================
--- branches/release/boost/heap/detail/mutable_heap.hpp (original)
+++ branches/release/boost/heap/detail/mutable_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -146,7 +146,7 @@
return *this;
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
priority_queue_mutable_wrapper (priority_queue_mutable_wrapper && rhs):
q_(std::move(rhs.q_))
{
@@ -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: branches/release/boost/heap/detail/stable_heap.hpp
==============================================================================
--- branches/release/boost/heap/detail/stable_heap.hpp (original)
+++ branches/release/boost/heap/detail/stable_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -34,7 +34,7 @@
size_(0)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
size_holder(size_holder && rhs):
size_(rhs.size_)
{
@@ -92,7 +92,7 @@
size_holder(void)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
size_holder(size_holder && rhs)
{}
@@ -166,7 +166,7 @@
#endif
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
heap_base(heap_base && rhs):
#ifndef BOOST_MSVC
Cmp(std::move(static_cast<Cmp&>(rhs))),
@@ -210,7 +210,7 @@
return val;
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
T && make_node(T && val)
{
return std::forward<T>(val);
@@ -300,7 +300,7 @@
counter_(0)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
heap_base(heap_base && rhs):
#ifndef BOOST_MSVC
Cmp(std::move(static_cast<Cmp&>(rhs))),
@@ -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: branches/release/boost/heap/fibonacci_heap.hpp
==============================================================================
--- branches/release/boost/heap/fibonacci_heap.hpp (original)
+++ branches/release/boost/heap/fibonacci_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -63,7 +63,7 @@
base_type(arg)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
type(type && rhs):
base_type(std::move(static_cast<base_type&>(rhs))),
allocator_type(std::move(static_cast<allocator_type&>(rhs)))
@@ -229,7 +229,7 @@
size_holder::set_size(rhs.size());
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
/// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
fibonacci_heap(fibonacci_heap && rhs):
super_t(std::move(rhs)), top_element(rhs.top_element)
@@ -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: branches/release/boost/heap/pairing_heap.hpp
==============================================================================
--- branches/release/boost/heap/pairing_heap.hpp (original)
+++ branches/release/boost/heap/pairing_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -63,7 +63,7 @@
base_type(arg)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
type(type const & rhs):
base_type(rhs), allocator_type(rhs)
{}
@@ -241,7 +241,7 @@
size_holder::set_size(rhs.get_size());
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
/// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
pairing_heap(pairing_heap && rhs):
super_t(std::move(rhs)), root(rhs.root)
@@ -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: branches/release/boost/heap/priority_queue.hpp
==============================================================================
--- branches/release/boost/heap/priority_queue.hpp (original)
+++ branches/release/boost/heap/priority_queue.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -123,13 +123,13 @@
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_))
@@ -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: branches/release/boost/heap/skew_heap.hpp
==============================================================================
--- branches/release/boost/heap/skew_heap.hpp (original)
+++ branches/release/boost/heap/skew_heap.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -84,7 +84,7 @@
children.assign(0);
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
skew_heap_node(value_type && v):
value(v)
{
@@ -199,7 +199,7 @@
base_type(arg)
{}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
type(type && rhs):
base_type(std::move(static_cast<base_type&>(rhs))),
allocator_type(std::move(static_cast<allocator_type&>(rhs)))
@@ -388,7 +388,7 @@
return *this;
}
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
/// \copydoc boost::heap::priority_queue::priority_queue(priority_queue &&)
skew_heap(skew_heap && rhs):
super_t(std::move(rhs)), root(rhs.root)
@@ -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: branches/release/libs/heap/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/heap/doc/Jamfile.v2 (original)
+++ branches/release/libs/heap/doc/Jamfile.v2 2012-12-14 12:15:35 EST (Fri, 14 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
Modified: branches/release/libs/heap/test/common_heap_tests.hpp
==============================================================================
--- branches/release/libs/heap/test/common_heap_tests.hpp (original)
+++ branches/release/libs/heap/test/common_heap_tests.hpp 2012-12-14 12:15:35 EST (Fri, 14 Dec 2012)
@@ -68,7 +68,7 @@
q.push(data[i]);
}
-#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 <typename pri_queue, typename data_container>
void fill_emplace_q(pri_queue & q, data_container const & data)
{
@@ -108,7 +108,7 @@
template <typename pri_queue>
void pri_queue_test_emplace(void)
{
-#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)
for (int i = 0; i != test_size; ++i)
{
pri_queue q;
@@ -173,7 +173,7 @@
template <typename pri_queue>
void pri_queue_test_moveconstructor(void)
{
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
pri_queue q;
test_data data = make_test_data(test_size);
fill_q(q, data);
@@ -188,7 +188,7 @@
template <typename pri_queue>
void pri_queue_test_move_assignment(void)
{
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
pri_queue q;
test_data data = make_test_data(test_size);
fill_q(q, data);
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