diff options
| author | louiz’ <louiz@louiz.org> | 2017-03-06 03:04:26 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-03-06 03:04:26 +0100 |
| commit | a1349361d2c15929e8260536c9091f2a4c2048a4 (patch) | |
| tree | a2eb734566a7ae708a705b071f04cc2f20bb2e0e /louloulibs/utils/scopeguard.hpp | |
| parent | ef3c6c28dd1f58ad60928487115a9124ffb99266 (diff) | |
| parent | 11c63ebceb07d9b65ed16182139477ea79739c12 (diff) | |
| download | biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.tar.gz biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.tar.bz2 biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.tar.xz biboumi-a1349361d2c15929e8260536c9091f2a4c2048a4.zip | |
Merge branch 'master' into debian
Diffstat (limited to 'louloulibs/utils/scopeguard.hpp')
| -rw-r--r-- | louloulibs/utils/scopeguard.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/louloulibs/utils/scopeguard.hpp b/louloulibs/utils/scopeguard.hpp index cd0e89e..e697fc3 100644 --- a/louloulibs/utils/scopeguard.hpp +++ b/louloulibs/utils/scopeguard.hpp @@ -87,9 +87,11 @@ private: }; template<typename F> -auto make_scope_guard(F&& f) +auto make_scope_guard(F f) { - return std::unique_ptr<void, std::decay_t<F>>{(void*)1, std::forward<F>(f)}; + static struct Empty {} empty; + auto deleter = [f = std::move(f)](Empty*) { f(); }; + return std::unique_ptr<Empty, decltype(deleter)>{&empty, std::move(deleter)}; } } |