[Boost-commit] svn:boost r76067 - in branches/release: boost/heap boost/heap/detail libs/heap libs/heap/test

Subject: [Boost-commit] svn:boost r76067 - in branches/release: boost/heap boost/heap/detail libs/heap libs/heap/test
From: tim_at_[hidden]
Date: 2011-12-19 11:34:01

Author: timblechmann
Date: 2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
New Revision: 76067
URL: http://svn.boost.org/trac/boost/changeset/76067

Log:
heap: merge from trunk

Properties modified: 
   branches/release/boost/heap/   (props changed)
   branches/release/libs/heap/   (props changed)
Text files modified: 
   branches/release/boost/heap/detail/heap_node.hpp        |     2 +-                                      
   branches/release/boost/heap/detail/stable_heap.hpp      |     4 ++--                                    
   branches/release/libs/heap/test/binomial_heap_test.cpp  |     6 ++----                                  
   branches/release/libs/heap/test/common_heap_tests.hpp   |     4 ++--                                    
   branches/release/libs/heap/test/d_ary_heap_test.cpp     |     6 ++----                                  
   branches/release/libs/heap/test/fibonacci_heap_test.cpp |     6 ++----                                  
   branches/release/libs/heap/test/mutable_heap_test.cpp   |     4 +---                                    
   branches/release/libs/heap/test/mutable_heap_tests.hpp  |     4 +++-                                    
   branches/release/libs/heap/test/pairing_heap_tests.cpp  |     6 ++----                                  
   branches/release/libs/heap/test/priority_queue_test.cpp |     6 ++----                                  
   branches/release/libs/heap/test/skew_heap_test.cpp      |     6 ++----                                  
   11 files changed, 21 insertions(+), 33 deletions(-)

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	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -363,4 +363,4 @@
 } /* namespace boost */
 
 #undef BOOST_HEAP_ASSERT
-#endif /* BOOST_HEAP_DETAIL_HEAP_NODE_HPP */
\ No newline at end of file
+#endif /* BOOST_HEAP_DETAIL_HEAP_NODE_HPP */

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	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -297,7 +297,7 @@
 
     internal_type make_node(T const & val)
     {
-        std::size_t count = ++counter_;
+        stability_counter_type count = ++counter_;
         if (counter_ == std::numeric_limits<stability_counter_type>::max())
             BOOST_THROW_EXCEPTION(std::runtime_error("boost::heap counter overflow"));
         return std::make_pair(val, count);
@@ -307,7 +307,7 @@
     template <class... Args>
     internal_type make_node(Args&&... args)
     {
-        std::size_t count = ++counter_;
+        stability_counter_type count = ++counter_;
         if (counter_ == std::numeric_limits<stability_counter_type>::max())
             BOOST_THROW_EXCEPTION(std::runtime_error("boost::heap counter overflow"));
         return std::make_pair(std::forward<T>(args)..., count);

Modified: branches/release/libs/heap/test/binomial_heap_test.cpp
==============================================================================
--- branches/release/libs/heap/test/binomial_heap_test.cpp	(original)
+++ branches/release/libs/heap/test/binomial_heap_test.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/binomial_heap.hpp"
+#include <boost/heap/binomial_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"

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	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -7,7 +7,7 @@
 #include <boost/concept/assert.hpp>
 #include <boost/concept_archetype.hpp>
 
-#include "../../../boost/heap/heap_concepts.hpp"
+#include <boost/heap/heap_concepts.hpp>
 
 
 typedef boost::default_constructible_archetype<
@@ -65,7 +65,7 @@
 void fill_emplace_q(pri_queue & q, data_container const & data)
 {
     for (unsigned int i = 0; i != data.size(); ++i) {
-        auto value = data[i];
+        typename pri_queue::value_type value = data[i];
         q.emplace(std::move(value));
     }
 }

Modified: branches/release/libs/heap/test/d_ary_heap_test.cpp
==============================================================================
--- branches/release/libs/heap/test/d_ary_heap_test.cpp	(original)
+++ branches/release/libs/heap/test/d_ary_heap_test.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/d_ary_heap.hpp"
+#include <boost/heap/d_ary_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"

Modified: branches/release/libs/heap/test/fibonacci_heap_test.cpp
==============================================================================
--- branches/release/libs/heap/test/fibonacci_heap_test.cpp	(original)
+++ branches/release/libs/heap/test/fibonacci_heap_test.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/fibonacci_heap.hpp"
+#include <boost/heap/fibonacci_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"

Modified: branches/release/libs/heap/test/mutable_heap_test.cpp
==============================================================================
--- branches/release/libs/heap/test/mutable_heap_test.cpp	(original)
+++ branches/release/libs/heap/test/mutable_heap_test.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,7 +1,5 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <boost/heap/d_ary_heap.hpp>
 #include <boost/heap/fibonacci_heap.hpp>

Modified: branches/release/libs/heap/test/mutable_heap_tests.hpp
==============================================================================
--- branches/release/libs/heap/test/mutable_heap_tests.hpp	(original)
+++ branches/release/libs/heap/test/mutable_heap_tests.hpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -3,6 +3,8 @@
 
 #ifdef USE_BOOST_RANDOM
 #include <boost/random.hpp>
+#else
+#include <cstdlib>
 #endif
 
 #include "common_heap_tests.hpp"
@@ -230,7 +232,7 @@
 
                         int index = gen();
 #else
-            int index = random() % (data.size() - 1);
+            int index = rand() % (data.size() - 1);
 #endif
             q.erase(handles[index]);
             handles.erase(handles.begin() + index);

Modified: branches/release/libs/heap/test/pairing_heap_tests.cpp
==============================================================================
--- branches/release/libs/heap/test/pairing_heap_tests.cpp	(original)
+++ branches/release/libs/heap/test/pairing_heap_tests.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/pairing_heap.hpp"
+#include <boost/heap/pairing_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"

Modified: branches/release/libs/heap/test/priority_queue_test.cpp
==============================================================================
--- branches/release/libs/heap/test/priority_queue_test.cpp	(original)
+++ branches/release/libs/heap/test/priority_queue_test.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/priority_queue.hpp"
+#include <boost/heap/priority_queue.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"

Modified: branches/release/libs/heap/test/skew_heap_test.cpp
==============================================================================
--- branches/release/libs/heap/test/skew_heap_test.cpp	(original)
+++ branches/release/libs/heap/test/skew_heap_test.cpp	2011-12-19 11:34:00 EST (Mon, 19 Dec 2011)
@@ -1,11 +1,9 @@
-#include <climits>
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include "boost/test/included/unit_test.hpp"
+#include <boost/test/unit_test.hpp>
 
 #include <algorithm>
 
-#include "../../../boost/heap/skew_heap.hpp"
+#include <boost/heap/skew_heap.hpp>
 
 #include "common_heap_tests.hpp"
 #include "stable_heap_tests.hpp"