Matteo De Carlo
fdc052b9f9
Fixes #414 The issue is caused by Linux (and possibly other platforms) implementing the hash function as an identify function for data smaller than 64bit (including `int`). Fixing only the TerrainGenerator is possible, but the issue could be generated again elsewhere and it would be quite difficult to identify and debug. Therefore the proposed solution is to replace the `wi::unordered_map` on Linux with another implementation which is still quite fast and does account for the issue of the identify hash function. The library is https://github.com/martinus/robin-hood-hashing (MIT License) robin_hood.h:768 ``` // return mixed of that, to be safe against identity hash ```
30 lines
919 B
C++
30 lines
919 B
C++
#ifndef WI_UNORDERED_MAP_REPLACEMENT
|
|
#define WI_UNORDERED_MAP_REPLACEMENT
|
|
// This file is used to allow replacement of std::unordered_map
|
|
|
|
#ifndef WI_UNORDERED_MAP_TYPE
|
|
#define WI_UNORDERED_MAP_TYPE 1
|
|
#endif // WI_UNORDERED_MAP_TYPE
|
|
|
|
#if WI_UNORDERED_MAP_TYPE == 1
|
|
#include "Utility/flat_hash_map.hpp"
|
|
#elif WI_UNORDERED_MAP_TYPE == 2
|
|
#include "Utility/robin_hood.h"
|
|
#else
|
|
#include <unordered_map>
|
|
#endif // WI_UNORDERED_MAP_TYPE
|
|
|
|
namespace wi
|
|
{
|
|
template<typename K, typename V, typename H = std::hash<K>, typename E = std::equal_to<K>, typename A = std::allocator<std::pair<const K, V> > >
|
|
#if WI_UNORDERED_MAP_TYPE == 1
|
|
using unordered_map = ska::flat_hash_map<K, V, H, E, A>;
|
|
#elif WI_UNORDERED_MAP_TYPE == 2
|
|
using unordered_map = robin_hood::unordered_flat_map<K, V, H, E>;
|
|
#else
|
|
using unordered_map = std::unordered_map<K, V, H, E, A>;
|
|
#endif // WI_UNORDERED_MAP_TYPE
|
|
}
|
|
|
|
#endif // WI_UNORDERED_MAP_REPLACEMENT
|