Commit 7f08cf83 authored by louiz’'s avatar louiz’

Little scopeguard cleanup, and add a test

parent fa6635e5
......@@ -152,7 +152,7 @@ namespace utils
throw std::runtime_error("Cannot convert into UTF-8");
// Make sure cd is always closed when we leave this function
const auto sg = utils::make_scope_guard([&cd](auto&&){ iconv_close(cd); });
const auto sg = utils::make_scope_guard([&cd](){ iconv_close(cd); });
size_t inbytesleft = str.size();
......@@ -169,7 +169,7 @@ namespace utils
char* outbuf_ptr = outbuf;
// Make sure outbuf is always deleted when we leave this function
const auto sg2 = utils::make_scope_guard([outbuf](auto&&){ delete[] outbuf; });
const auto sg2 = utils::make_scope_guard([outbuf](){ delete[] outbuf; });
bool done = false;
while (done == false)
......
......@@ -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)};
}
}
......
......@@ -8,6 +8,7 @@
#include <utils/empty_if_fixed_server.hpp>
#include <utils/get_first_non_empty.hpp>
#include <utils/time.hpp>
#include <utils/scopeguard.hpp>
using namespace std::string_literals;
......@@ -140,3 +141,13 @@ TEST_CASE("parse_datetime")
CHECK(utils::parse_datetime("1970-01-02T00:00:12*00:00") == -1);
CHECK(utils::parse_datetime("1970-01-02T00:00:12+0000") == -1);
}
TEST_CASE("scope_guard")
{
bool res = false;
{
auto guard = utils::make_scope_guard([&res](){ res = true; });
CHECK(!res);
}
CHECK(res);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment