Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix for gcc: philip reports it doesn't have upper_bound (although it's part of STL). replaced with equal_range

Browse Source 
This was SVN commit r1150.
This commit is contained in:
janwas 2004-09-19 11:23:12 +00:00
parent e675dbca5f
commit 5a8dd803a7
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/res/h_mgr.cpp
View File

@ -359,12 +359,8 @@ static Key2Idx key2idx;
static Handle find_key(uintptr_t key, H_Type type, bool remove = false)
{
It it = key2idx.find(key);
// not found in mapping
if(it == key2idx.end())
return -1;
It end = key2idx.upper_bound(key); // XXX this doesn't exist in gcc
for(; it != end; ++it)
std::pair<It, It> range = key2idx.equal_range(key);
for(It it = range.first; it != range.second; ++it)
{
i32 idx = it->second;
HDATA* hd = h_data(idx);
@ -377,9 +373,9 @@ static Handle find_key(uintptr_t key, H_Type type, bool remove = false)
}
}
// key is in the mapping, but it's of the wrong type.
// this happens when called by h_alloc to check if
// e.g. a Tex object already exists; at that time,
// not found at all, or it's of the wrong type.
// the latter happens when called by h_alloc to check
// if e.g. a Tex object already exists; at that time,
// only the corresponding VFile exists.
return -1;
}