diff options
author | louiz’ <louiz@louiz.org> | 2017-02-15 01:02:27 +0100 |
---|---|---|
committer | louiz’ <louiz@louiz.org> | 2017-02-15 01:07:32 +0100 |
commit | 7f08cf83aa5db58bfac004dddae565e6536eeb2c (patch) | |
tree | cc8a62788a6c82abeda802da9285e35cbf6002ce /louloulibs/utils/scopeguard.hpp | |
parent | fa6635e5487c3efe536c36a27be0ee10b918a346 (diff) | |
download | biboumi-7f08cf83aa5db58bfac004dddae565e6536eeb2c.tar.gz biboumi-7f08cf83aa5db58bfac004dddae565e6536eeb2c.tar.bz2 biboumi-7f08cf83aa5db58bfac004dddae565e6536eeb2c.tar.xz biboumi-7f08cf83aa5db58bfac004dddae565e6536eeb2c.zip |
Little scopeguard cleanup, and add a test
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)}; } } |