Merge pull request #1269 from bkaradzic/master

Fixed GCC+Clang errors and warnings on Linux and OSX.
This commit is contained in:
John Kessenich 2018-03-07 14:31:57 -07:00 committed by GitHub
commit a51525059f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View file

@ -7520,8 +7520,8 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
}
};
return std::abs(linearize(to2.getBasicType()) - linearize(from.getBasicType())) <
std::abs(linearize(to1.getBasicType()) - linearize(from.getBasicType()));
return abs(linearize(to2.getBasicType()) - linearize(from.getBasicType())) <
abs(linearize(to1.getBasicType()) - linearize(from.getBasicType()));
};
// for ambiguity reporting