From 01ec8c04e1861eba3fe000405aab285a0e751932 Mon Sep 17 00:00:00 2001 From: Ariel Date: Fri, 2 Feb 2024 22:39:35 +0800 Subject: [PATCH] Update assoc_heap.hh --- trees/assoc_heap.hh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/trees/assoc_heap.hh b/trees/assoc_heap.hh index dce13f5..13b0a52 100644 --- a/trees/assoc_heap.hh +++ b/trees/assoc_heap.hh @@ -5,15 +5,16 @@ private: template static constexpr auto __map_types(T _t) { return make_tuple(std::priority_queue<_Tp, _Sequence, T>(_t)); } + template static constexpr auto __map_types(T _t, U... _o) { return tuple_cat(make_tuple(std::priority_queue<_Tp, _Sequence, T>(_t)), __map_types(_o...)); } - template static constexpr void __push(_Tp _val, T& _c) { + template static constexpr void __push(const _Tp& _val, T& _c) { _c.push(_val); } - template static constexpr void __push(_Tp _val, T& _c, U&... _o) { + template static constexpr void __push(const _Tp& _val, T& _c, U&... _o) { __push(_val, _c); __push(_val, _o...); } @@ -41,12 +42,12 @@ private: template constexpr void pop() { __roll(); - _count[get(_content).top()] -= 1; + _count[top()] -= 1; --_size; get(_content).pop(); } - constexpr void push(_Tp __val) { + constexpr void push(const _Tp& __val) { _count[__val] += 1; ++_size; apply([&] (auto&... cs) { __push(__val, cs...); }, _content); @@ -60,7 +61,7 @@ private: return !_size; } - template constexpr void emplace(T... _val) { + template constexpr void emplace(const T&... _val) { push(_Tp(_val...)); } }; @@ -68,6 +69,6 @@ private: public: template static auto make(tuple<_T_cs...> _comp) { auto _container = apply([&](auto... all) { return __map_types(all...); }, _comp); - return __assoc_heap>(_container, _comp); + return __assoc_heap>(_container, std::move(_comp)); } };