diff options
Diffstat (limited to 'boost/heap/heap_merge.hpp')
| -rw-r--r-- | boost/heap/heap_merge.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/boost/heap/heap_merge.hpp b/boost/heap/heap_merge.hpp index 192d0f9d32..615b492ed5 100644 --- a/boost/heap/heap_merge.hpp +++ b/boost/heap/heap_merge.hpp @@ -13,6 +13,11 @@ #include <boost/heap/heap_concepts.hpp> #include <boost/type_traits/is_same.hpp> +#ifdef BOOST_HAS_PRAGMA_ONCE +#pragma once +#endif + + namespace boost { namespace heap { namespace detail { @@ -56,8 +61,8 @@ struct heap_merge_emulate 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); } |