[Boost-commit] svn:boost r81462 - in trunk/boost/heap: . detail

Subject: [Boost-commit] svn:boost r81462 - in trunk/boost/heap: . detail
From: tim_at_[hidden]
Date: 2012-11-21 11:52:31

Author: timblechmann
Date: 2012-11-21 11:52:31 EST (Wed, 21 Nov 2012)
New Revision: 81462
URL: http://svn.boost.org/trac/boost/changeset/81462

Log:
heap: fix more style issues
Text files modified: 
   trunk/boost/heap/detail/heap_comparison.hpp |     4 ++--                                    
   trunk/boost/heap/detail/stable_heap.hpp     |     2 +-                                      
   trunk/boost/heap/heap_merge.hpp             |     4 ++--                                    
   3 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/heap/detail/heap_comparison.hpp
==============================================================================
--- trunk/boost/heap/detail/heap_comparison.hpp	(original)
+++ trunk/boost/heap/detail/heap_comparison.hpp	2012-11-21 11:52:31 EST (Wed, 21 Nov 2012)
@@ -230,8 +230,8 @@
                                       heap_compare_copy
                                      >::type compare_check;
 
-    compare_check check;
-    return check(lhs, rhs);
+    compare_check check_object;
+    return check_object(lhs, rhs);
 }
 
 

Modified: trunk/boost/heap/detail/stable_heap.hpp
==============================================================================
--- trunk/boost/heap/detail/stable_heap.hpp	(original)
+++ trunk/boost/heap/detail/stable_heap.hpp	2012-11-21 11:52:31 EST (Wed, 21 Nov 2012)
@@ -354,7 +354,7 @@
     internal_type make_node(T const & val)
     {
         stability_counter_type count = ++counter_;
-        if (counter_ == std::numeric_limits<stability_counter_type>::max())
+        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);
     }

Modified: trunk/boost/heap/heap_merge.hpp
==============================================================================
--- trunk/boost/heap/heap_merge.hpp	(original)
+++ trunk/boost/heap/heap_merge.hpp	2012-11-21 11:52:31 EST (Wed, 21 Nov 2012)
@@ -56,8 +56,8 @@
             rhs.pop();
         }
 
-        lhs.set_stability_count(std::max(lhs.get_stability_count(),
-                                         rhs.get_stability_count()));
+        lhs.set_stability_count((std::max)(lhs.get_stability_count(),
+                                           rhs.get_stability_count()));
         rhs.set_stability_count(0);
     }