Sfoglia il codice sorgente

Fixing a name collision warning/error encountered on clang. (#126)

Dario 9 anni fa
parent
commit
d3778e078f
1 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. 6 6
      include/bx/handlealloc.h

+ 6 - 6
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;
 		}