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

Subject: [Boost-commit] svn:boost r81722 - in branches/release: boost/heap libs/heap libs/heap/test
From: tim_at_[hidden]
Date: 2012-12-05 11:01:43

Author: timblechmann
Date: 2012-12-05 11:01:42 EST (Wed, 05 Dec 2012)
New Revision: 81722
URL: http://svn.boost.org/trac/boost/changeset/81722

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/libs/heap/test/common_heap_tests.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

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-05 11:01:42 EST (Wed, 05 Dec 2012)
@@ -68,7 +68,7 @@
         q.push(data[i]);
 }
 
-#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if defined(BOOST_HAS_RVALUE_REFS) && !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_VARIADIC_TEMPLATES)
+#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     for (int i = 0; i != test_size; ++i)
     {
         pri_queue q;