xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Change HashCompatible trait to a variable template"

Browse Source 
This reverts commit b58f72315c.
Unfortunately gcc-5.1 handling of variable template partial
specializations is bugged.
This commit is contained in:
Maxime Coste 2017-08-18 08:17:02 +07:00
parent 65bac9c027
commit 1688332d12
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hash.hh
View File

@ -61,10 +61,12 @@ struct Hash
// Traits specifying if two types have compatible hashing, that is, // Traits specifying if two types have compatible hashing, that is,
// if lhs == rhs => hash_value(lhs) == hash_value(rhs) // if lhs == rhs => hash_value(lhs) == hash_value(rhs)
template<typename Lhs, typename Rhs> template<typename Lhs, typename Rhs>
constexpr bool HashCompatible = false; struct HashCompatible : std::false_type {};
template<typename T> template<typename T> struct HashCompatible<T, T> : std::true_type {};
constexpr bool HashCompatible<T, T> = true;
template<typename Lhs, typename Rhs>
constexpr bool IsHashCompatible = HashCompatible<Lhs, Rhs>::value;
} }

2
src/hash_map.hh
View File

@ -156,7 +156,7 @@ struct HashMap
template<typename KeyType> template<typename KeyType>
using EnableIfHashCompatible = std::enable_if_t< using EnableIfHashCompatible = std::enable_if_t<
HashCompatible<Key, std::decay_t<KeyType>> IsHashCompatible<Key, std::decay_t<KeyType>>
>; >;
template<typename KeyType, typename = EnableIfHashCompatible<KeyType>> template<typename KeyType, typename = EnableIfHashCompatible<KeyType>>

4
src/string.hh
View File

@ -256,8 +256,8 @@ private:
static_assert(std::is_trivial<StringView>::value, ""); static_assert(std::is_trivial<StringView>::value, "");
template<> constexpr bool HashCompatible<String, StringView> = true; template<> struct HashCompatible<String, StringView> : std::true_type {};
template<> constexpr bool HashCompatible<StringView, String> = true; template<> struct HashCompatible<StringView, String> : std::true_type {};
inline String::String(StringView str) : String{str.begin(), str.length()} {} inline String::String(StringView str) : String{str.begin(), str.length()} {}