procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use std::vector in rpl::lifetime.

This commit is contained in:
John Preston 2019-04-17 13:40:54 +04:00
parent 305a611211
commit be0cf8d379
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/rpl/lifetime.h
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once #pragma once
#include "base/unique_function.h" #include "base/unique_function.h"
#include <deque> #include <vector>
namespace rpl { namespace rpl {
namespace details { namespace details {
@ -25,6 +25,7 @@ public:
lifetime() = default; lifetime() = default;
lifetime(lifetime &&other); lifetime(lifetime &&other);
lifetime &operator=(lifetime &&other); lifetime &operator=(lifetime &&other);
~lifetime() { destroy(); }
template <typename Destroy, typename = decltype(std::declval<Destroy>()())> template <typename Destroy, typename = decltype(std::declval<Destroy>()())>
lifetime(Destroy &&destroy); lifetime(Destroy &&destroy);
@ -38,18 +39,16 @@ public:
template <typename Type, typename... Args> template <typename Type, typename... Args>
Type *make_state(Args&& ...args) { Type *make_state(Args&& ...args) {
auto result = new Type(std::forward<Args>(args)...); const auto result = new Type(std::forward<Args>(args)...);
add([result] { add([=] {
static_assert(sizeof(Type) > 0, "Can't delete unknown type."); static_assert(sizeof(Type) > 0, "Can't delete unknown type.");
delete result; delete result;
}); });
return result; return result;
} }
~lifetime() { destroy(); }
private: private:
std::deque<base::unique_function<void()>> _callbacks; std::vector<base::unique_function<void()>> _callbacks;
}; };
@ -70,20 +69,21 @@ inline lifetime::lifetime(Destroy &&destroy) {
template <typename Destroy, typename> template <typename Destroy, typename>
inline void lifetime::add(Destroy &&destroy) { inline void lifetime::add(Destroy &&destroy) {
_callbacks.push_front(destroy); _callbacks.emplace_back(std::forward<Destroy>(destroy));
} }
inline void lifetime::add(lifetime &&other) { inline void lifetime::add(lifetime &&other) {
auto callbacks = details::take(other._callbacks); auto callbacks = details::take(other._callbacks);
_callbacks.insert( _callbacks.insert(
_callbacks.begin(), _callbacks.end(),
std::make_move_iterator(callbacks.begin()), std::make_move_iterator(callbacks.begin()),
std::make_move_iterator(callbacks.end())); std::make_move_iterator(callbacks.end()));
} }
inline void lifetime::destroy() { inline void lifetime::destroy() {
for (auto &callback : details::take(_callbacks)) { auto callbacks = details::take(_callbacks);
callback(); for (auto i = callbacks.rbegin(), e = callbacks.rend(); i != e; ++i) {
(*i)();
} }
} }