Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-18 04:53:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed strCmp.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-10-01 23:12:32 -07:00
parent 91455f1c48
commit 9c7868aa28
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/string.cpp
View File

@@ -164,16 +164,16 @@ namespace bx
return _ch;
}
template<typename Ty>
inline Ty min(Ty _a, Ty _b)
{
return _a > _b ? _b : _a;
}
template<CharFn fn>
inline int32_t strCmp(const char* _lhs, int32_t _lhsMax, const char* _rhs, int32_t _rhsMax)
{
int32_t max = _lhsMax;
if (_lhsMax != _rhsMax)
{
max = _lhsMax < _rhsMax ? _lhsMax : _rhsMax;
return fn(_lhs[max]) - fn(_rhs[max]);
}
int32_t max = min(_lhsMax, _rhsMax);
for (
; 0 < max && fn(*_lhs) == fn(*_rhs)
@@ -190,12 +190,6 @@ namespace bx
return 0 == max ? 0 : fn(*_lhs) - fn(*_rhs);
}
template<typename Ty>
inline Ty min(Ty _a, Ty _b)
{
return _a > _b ? _b : _a;
}
int32_t strCmp(const StringView& _lhs, const StringView& _rhs, int32_t _max)
{
return strCmp<toNoop>(
@@ -218,14 +212,7 @@ namespace bx
inline int32_t strCmpV(const char* _lhs, int32_t _lhsMax, const char* _rhs, int32_t _rhsMax)
{
int32_t max = _lhsMax;
if (_lhsMax != _rhsMax)
{
max = _lhsMax < _rhsMax ? _lhsMax : _rhsMax;
return _lhs[max] - _rhs[max];
}
int32_t max = min(_lhsMax, _rhsMax);
int32_t ii = 0;
int32_t idx = 0;
bool zero = true;