[Boost-commit] svn:boost r76230 - trunk/boost/heap

Subject: [Boost-commit] svn:boost r76230 - trunk/boost/heap
From: tim_at_[hidden]
Date: 2011-12-30 06:05:18

Author: timblechmann
Date: 2011-12-30 06:05:17 EST (Fri, 30 Dec 2011)
New Revision: 76230
URL: http://svn.boost.org/trac/boost/changeset/76230

Log:
heap: msvc compile fix

Text files modified: 
   trunk/boost/heap/skew_heap.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/heap/skew_heap.hpp
==============================================================================
--- trunk/boost/heap/skew_heap.hpp	(original)
+++ trunk/boost/heap/skew_heap.hpp	2011-12-30 06:05:17 EST (Fri, 30 Dec 2011)
@@ -418,14 +418,14 @@
         return push_helper::push(this, v);
     }
 
-#ifdef BOOST_HAS_RVALUE_REFS
+#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
     /**
      * \b Effects: Adds a new element to the priority queue. The element is directly constructed in-place.
      *
      * \b Complexity: Logarithmic (amortized).
      *
      * */
-    template <class... Args>
+    template <typename... Args>
     typename mpl::if_c<is_mutable, handle_type, void>::type emplace(Args&&... args)
     {
         typedef typename mpl::if_c<is_mutable, push_handle, push_void>::type push_helper;
@@ -756,7 +756,7 @@
             self->push_internal(v);
         }
 
-#ifdef BOOST_HAS_RVALUE_REFS
+#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
         template <class... Args>
         static void emplace(skew_heap * self, Args&&... args)
         {
@@ -772,7 +772,7 @@
             return handle_type(self->push_internal(v));
         }
 
-#ifdef BOOST_HAS_RVALUE_REFS
+#if defined(BOOST_HAS_RVALUE_REFS) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
         template <class... Args>
         static handle_type emplace(skew_heap * self, Args&&... args)
         {