Zylann/godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GCC compilation

Browse Source
This commit is contained in:
Marc Gilleron 2022-02-13 17:07:43 +00:00
parent 907351dd1a
commit d61da56c5b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/flat_map.h
View File

@ -44,7 +44,7 @@ public:
_items.push_back(Pair{ key, value });
return true;
}
std::vector<Pair>::const_iterator it = std::lower_bound(_items.begin(), _items.end(), key);
typename std::vector<Pair>::const_iterator it = std::lower_bound(_items.begin(), _items.end(), key);
if (it->key == key) {
return false;
}
@ -58,7 +58,7 @@ public:
_items.push_back(Pair{ key, value });
return;
}
std::vector<Pair>::iterator it = std::lower_bound(_items.begin(), _items.end(), key);
typename std::vector<Pair>::iterator it = std::lower_bound(_items.begin(), _items.end(), key);
if (it->key == key) {
it->value = value;
} else {
@ -78,7 +78,7 @@ public:
}
bool find(K key, T &out_value) const {
std::vector<Pair>::const_iterator it = std::lower_bound(_items.begin(), _items.end(), key);
typename std::vector<Pair>::const_iterator it = std::lower_bound(_items.begin(), _items.end(), key);
if (it != _items.end() && it->key == key) {
out_value = it->value;
return true;
@ -95,12 +95,12 @@ public:
// Making it work would require passing a struct with two operators() with arguments in both orders...
//return std::binary_search(_items.cbegin(), _items.cend(), key);
std::vector<Pair>::const_iterator it = std::lower_bound(_items.begin(), _items.end(), key);
typename std::vector<Pair>::const_iterator it = std::lower_bound(_items.begin(), _items.end(), key);
return it != _items.end() && it->key == key;
}
bool erase(K key) {
std::vector<Pair>::iterator it = std::lower_bound(_items.begin(), _items.end(), key);
typename std::vector<Pair>::iterator it = std::lower_bound(_items.begin(), _items.end(), key);
if (it != _items.end() && it->key == key) {
_items.erase(it);
return true;