mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3332-version-7-x-should-work-with-gcc-4-9-as-stated-in-install-file' into 'v7'

Browse Source 
Compile with gcc 4.9

See merge request louiz/biboumi!22
This commit is contained in:
louiz’
2018-01-25 02:02:45 +01:00
parent 23e51e814f 33a5f1355d
commit 2a2808ac62
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/row.hpp
+2 -2
View File
@@ -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)
src/utils/is_one_of.hpp
+3 -6
View File
@@ -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;
tests/utils.cpp
+7 -7
View File
@@ -175,11 +175,11 @@ TEST_CASE("dirname")
TEST_CASE("is_in")
{
CHECK((is_one_of<int, float, std::string, int>) == true);
CHECK((is_one_of<int, float, std::string>) == false);
CHECK((is_one_of<int>) == false);
CHECK((is_one_of<int, int>) == true);
CHECK((is_one_of<bool, int>) == false);
CHECK((is_one_of<bool, bool>) == true);
CHECK((is_one_of<bool, bool, bool, bool, bool, int>) == true);
CHECK((is_one_of<int, float, std::string, int>::value) == true);
CHECK((is_one_of<int, float, std::string>::value) == false);
CHECK((is_one_of<int>::value) == false);
CHECK((is_one_of<int, int>::value) == true);
CHECK((is_one_of<bool, int>::value) == false);
CHECK((is_one_of<bool, bool>::value) == true);
CHECK((is_one_of<bool, bool, bool, bool, bool, int>::value) == true);
}