TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch obj_get_signature to std::any_of

Browse source 
Also, split the predicate into separate statements to improve the output
of analysis tools.
This commit is contained in:
Kp 2016-11-19 17:24:53 +00:00
parent 223a9dfd56
commit 382d337118
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
similar/main/object.cpp
View file

@ -924,10 +924,12 @@ object_signature_t obj_get_signature()
if (unlikely(lsig == std::numeric_limits<decltype(sig)>::max()))
lsig = 0;
++ lsig;
const auto predicate = [lsig](const vcobjptr_t &o) {
return o->type != OBJ_NONE && o->signature.get() == lsig;
const auto predicate = [lsig](const object_base &o) {
if (o.type == OBJ_NONE)
return false;
return o.signature.get() == lsig;
};
if (std::find_if(b, e, predicate) != e)
if (std::any_of(b, e, predicate))
continue;
sig = static_cast<int16_t>(lsig);
return object_signature_t{static_cast<uint16_t>(lsig)};