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

Merge branch 'master' of github.com:bkaradzic/bx

Browse Source
This commit is contained in:
Branimir Karadžić
2016-09-12 19:37:01 -07:00
parent 5043b7fadb 469a035b2a
commit f885361f0e
8 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bx/bx.h
View File

@@ -82,6 +82,6 @@ namespace bx
} // namespace bx
// Annoying C++0x stuff..
namespace std { namespace tr1 {}; using namespace tr1; }
//namespace std { namespace tr1 {}; using namespace tr1; }
#endif // BX_H_HEADER_GUARD

12
include/bx/handlealloc.h
View File

@@ -452,8 +452,8 @@ namespace bx
}
const KeyT hash = mix(_key);
const uint32_t first = hash % MaxCapacityT;
uint32_t idx = first;
const uint32_t firstIdx = hash % MaxCapacityT;
uint32_t idx = firstIdx;
do
{
if (m_handle[idx] == invalid)
@@ -471,7 +471,7 @@ namespace bx
idx = (idx + 1) % MaxCapacityT;
} while (idx != first);
} while (idx != firstIdx);
return false;
}
@@ -577,8 +577,8 @@ namespace bx
{
const KeyT hash = mix(_key);
const uint32_t first = hash % MaxCapacityT;
uint32_t idx = first;
const uint32_t firstIdx = hash % MaxCapacityT;
uint32_t idx = firstIdx;
do
{
if (m_handle[idx] == invalid)
@@ -593,7 +593,7 @@ namespace bx
idx = (idx + 1) % MaxCapacityT;
} while (idx != first);
} while (idx != firstIdx);
return UINT32_MAX;
}

3
include/bx/string.h
View File

@@ -43,9 +43,8 @@ namespace bx
///
inline size_t strnlen(const char* _str, size_t _max)
{
const char* end = _str + _max;
const char* ptr;
for (ptr = _str; ptr < end && *ptr != '\0'; ++ptr) {};
for (ptr = _str; 0 < _max && *ptr != '\0'; ++ptr, --_max) {};
return ptr - _str;
}