diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
| commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
| tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /boost/heap/heap_merge.hpp | |
| parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
| download | boost-upstream/1.57.0.tar.gz boost-upstream/1.57.0.tar.bz2 boost-upstream/1.57.0.zip | |
Imported Upstream version 1.57.0upstream/1.57.0
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); } |