From d3778e078f6713663b1490b9e89d9fe1dd30efc8 Mon Sep 17 00:00:00 2001 From: Dario Date: Sat, 10 Sep 2016 18:55:56 +0200 Subject: [PATCH] Fixing a name collision warning/error encountered on clang. (#126) --- include/bx/handlealloc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/bx/handlealloc.h b/include/bx/handlealloc.h index 2a05f21..0f63ee5 100644 --- a/include/bx/handlealloc.h +++ b/include/bx/handlealloc.h @@ -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; }