oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix compilation failure on old gcc, avoid compiler warnings

Browse source 
std::underlying_type isn't allowed to be used unless you already know
the type is an enum (until C++20), and causes a compilation failure if
used (even after the boolean check) on gcc 8 and below.

The bind_blob and bind_text taking over ownership might be useful, but
currently aren't used so just comment them out so if someone develops a
need they are ready to go.
This commit is contained in:
Jason Rhinelander 2020-03-30 22:51:37 -03:00
parent ce1492afb6
commit d0572297f1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cryptonote_core/loki_name_system.cpp
View file

@ -180,6 +180,7 @@ bool bind(sql_compiled_statement& s, int index, lokimq::string_view text)
return SQLITE_OK == sqlite3_bind_text(s.statement, index, text.data(), text.size(), nullptr /*dtor*/);
}
/* Currently unused; comment out until needed to avoid a compiler warning
// text, from a temporary std::string; ownership of the string data is transferred to sqlite3
bool bind(sql_compiled_statement& s, int index, std::string&& text)
{
@ -191,11 +192,13 @@ bool bind(sql_compiled_statement& s, int index, std::string&& text)
delete local_text;
return false;
}
*/
template <typename T, typename SFINAE = void>
struct is_int_enum : std::false_type {};
template <typename T>
struct is_int_enum<T, std::enable_if_t<std::is_enum<T>::value && std::is_same<std::underlying_type_t<T>, int>::value>> : std::true_type {};
struct is_int_enum<T, std::enable_if_t<std::is_enum<T>::value>>
: std::integral_constant<bool, std::is_same<std::underlying_type_t<T>, int>::value> {};
// Binds, but gives index as an enum class
template <typename T, typename I, std::enable_if_t<is_int_enum<I>::value, int> = 0>
@ -218,6 +221,7 @@ bool bind_blob(sql_compiled_statement& s, int index, lokimq::string_view blob)
return SQLITE_OK == sqlite3_bind_blob(s.statement, index, blob.data(), blob.size(), nullptr /*dtor*/);
}
/* Currently unused; comment out until needed to avoid a compiler warning
// From a std::string rvalue; sqlite3 manages ownership
bool bind_blob(sql_compiled_statement& s, int index, std::string&& blob)
{
@ -229,6 +233,7 @@ bool bind_blob(sql_compiled_statement& s, int index, std::string&& blob)
delete local_blob;
return false;
}
*/
// Wrapper for bind_blob with an enum index
template <typename... T, typename I, std::enable_if_t<is_int_enum<I>::value, int> = 0>