Skip to content

src: do not use std::function for OnScopeLeave #30134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 3 commits into from
Closed

src: do not use std::function for OnScopeLeave #30134

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
206f134
src: do not use `std::function` for `OnScopeLeave`
addaleax Oct 26, 2019
776285f
fixup! src: do not use `std::function` for `OnScopeLeave`
addaleax Oct 26, 2019
e3aa3b6
fixup! src: do not use `std::function` for `OnScopeLeave`
addaleax Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! src: do not use std::function for OnScopeLeave
  • Loading branch information
@addaleax
addaleax committed Nov 6, 2019
commit e3aa3b6ad958ff5f77904f17b935e159dc8e05d6
18 changes: 17 additions & 1 deletion src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,23 @@ template <typename T> inline void USE(T&&) {}
template <typename Fn>
struct OnScopeLeaveImpl {
Fn fn_;
~OnScopeLeaveImpl() { fn_(); }
bool active_;

explicit OnScopeLeaveImpl(Fn&& fn) : fn_(std::move(fn)), active_(true) {}
~OnScopeLeaveImpl() { if (active_) fn_(); }

OnScopeLeaveImpl(const OnScopeLeaveImpl& other) = delete;
OnScopeLeaveImpl& operator=(const OnScopeLeaveImpl& other) = delete;
OnScopeLeaveImpl(OnScopeLeaveImpl&& other)
: fn_(std::move(other.fn_)), active_(other.active_) {
other.active_ = false;
}
OnScopeLeaveImpl& operator=(OnScopeLeaveImpl&& other) {
if (this == &other) return *this;
this->~OnScopeLeave();
new (this)OnScopeLeaveImpl(std::move(other));
return *this;
}
};

// Run a function when exiting the current scope. Used like this:
Expand Down