Merge tag '7.2'

2 files changed, 5 insertions, 8 deletions

diff --git a/src/database/row.hpp b/src/database/row.hpp
index 1b50ff9..2d55897 100644
--- a/src/database/row.hpp
+++ b/src/database/row.hpp
@@ -30,13 +30,13 @@ struct Row
   }
 
   template <bool Coucou=true>
-  void save(std::unique_ptr<DatabaseEngine>& db,  typename std::enable_if<!is_one_of<Id, T...> && Coucou>::type* = nullptr)
+  void save(std::unique_ptr<DatabaseEngine>& db,  typename std::enable_if<!is_one_of<Id, T...>::value && Coucou>::type* = nullptr)
   {
     this->insert(*db);
   }
 
   template <bool Coucou=true>
-  void save(std::unique_ptr<DatabaseEngine>& db,  typename std::enable_if<is_one_of<Id, T...> && Coucou>::type* = nullptr)
+  void save(std::unique_ptr<DatabaseEngine>& db,  typename std::enable_if<is_one_of<Id, T...>::value && Coucou>::type* = nullptr)
   {
     const Id& id = std::get<Id>(this->columns);
     if (id.value == Id::unset_value)
diff --git a/src/utils/is_one_of.hpp b/src/utils/is_one_of.hpp
index 4d6770e..c706421 100644
--- a/src/utils/is_one_of.hpp
+++ b/src/utils/is_one_of.hpp
@@ -3,15 +3,12 @@
 #include <type_traits>
 
 template <typename...>
-struct is_one_of_implem {
+struct is_one_of {
     static constexpr bool value = false;
 };
 
 template <typename F, typename S, typename... T>
-struct is_one_of_implem<F, S, T...> {
+struct is_one_of<F, S, T...> {
     static constexpr bool value =
-        std::is_same<F, S>::value || is_one_of_implem<F, T...>::value;
+        std::is_same<F, S>::value || is_one_of<F, T...>::value;
 };
-
-template<typename... T>
-constexpr bool is_one_of = is_one_of_implem<T...>::value;