From 7f08cf83aa5db58bfac004dddae565e6536eeb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 15 Feb 2017 01:02:27 +0100
Subject: Little scopeguard cleanup, and add a test

---
 louloulibs/utils/scopeguard.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'louloulibs/utils/scopeguard.hpp')

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)};
 }
 
 }
-- 
cgit v1.2.3


From 0ab40dc1ab4e689921da54080b135e1d22b1c586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 14 Mar 2017 21:45:23 +0100
Subject: Refactoring louloulibs and cmake

Use OBJECT libraries
Remove the louloulibs directory
Write FOUND variables in the cache
---
 louloulibs/utils/scopeguard.hpp | 98 -----------------------------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 louloulibs/utils/scopeguard.hpp

(limited to 'louloulibs/utils/scopeguard.hpp')

diff --git a/louloulibs/utils/scopeguard.hpp b/louloulibs/utils/scopeguard.hpp
deleted file mode 100644
index e697fc3..0000000
--- a/louloulibs/utils/scopeguard.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <memory>
-#include <vector>
-
-/**
- * A class to be used to make sure some functions are called when the scope
- * is left, because they will be called in the ScopeGuard's destructor.  It
- * can for example be used to delete some pointer whenever any exception is
- * called.  Example:
-
- * {
- *  ScopeGuard scope;
- *  int* number = new int(2);
- *  scope.add_callback([number]() { delete number; });
- *  // Do some other stuff with the number. But these stuff might throw an exception:
- *  throw std::runtime_error("Some error not caught here, but in our caller");
- *  return true;
- * }
-
- * In this example, our pointer will always be deleted, even when the
- * exception is thrown.  If we want the functions to be called only when the
- * scope is left because of an unexpected exception, we can use
- * ScopeGuard::disable();
- */
-
-namespace utils
-{
-
-class ScopeGuard
-{
-public:
-  /**
-   * The constructor can take a callback. But additional callbacks can be
-   * added later with add_callback()
-   */
-  explicit ScopeGuard(std::function<void()>&& func):
-    enabled(true)
-  {
-    this->add_callback(std::move(func));
-  }
-
-  ScopeGuard(const ScopeGuard&) = delete;
-  ScopeGuard& operator=(ScopeGuard&&) = delete;
-  ScopeGuard(ScopeGuard&&) = delete;
-  ScopeGuard& operator=(const ScopeGuard&) = delete;
-
-  /**
-   * default constructor, the scope guard is enabled but empty, use
-   * add_callback()
-   */
-  explicit ScopeGuard():
-    enabled(true)
-  {
-  }
-  /**
-   * Call all callbacks in the desctructor, unless it has been disabled.
-   */
-  ~ScopeGuard()
-  {
-    if (this->enabled)
-      for (auto& func: this->callbacks)
-        func();
-  }
-  /**
-   * Add a callback to be called in our destructor, one scope guard can be
-   * used for more than one task, if needed.
-   */
-  void add_callback(std::function<void()>&& func)
-  {
-    this->callbacks.emplace_back(std::move(func));
-  }
-  /**
-   * Disable that scope guard, nothing will be done when the scope is
-   * exited.
-   */
-  void disable()
-  {
-    this->enabled = false;
-  }
-
-private:
-  bool enabled;
-  std::vector<std::function<void()>> callbacks;
-
-};
-
-template<typename F>
-auto make_scope_guard(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)};
-}
-
-}
-
-- 
cgit v1.2.3