Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-04-24 11:44:27 +02:00
8 changed files with 12 additions and 9 deletions

View File

@@ -45,7 +45,7 @@ public:
explicit ScopeExitGuard(F &&f):F(std::forward<F>(f)) {}
ScopeExitGuard(ScopeExitGuard &&src)
:F(std::move(src)) {
:F(std::move(src)), enabled(src.enabled) {
src.enabled = false;
}