Merge pull request #692 from davidcorrigan714/patch-1

Fix variable name in bits.h for MSVC builds
This commit is contained in:
gatecat 2021-05-01 10:25:00 +01:00 committed by GitHub
commit ed17091e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -51,7 +51,7 @@ struct Bits
#if defined(__GNUC__) || defined(__clang__)
return __builtin_popcount(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
return __popcnt(v);
return __popcnt(x);
#else
return generic_popcount(x);
#endif
@ -63,7 +63,7 @@ struct Bits
return __builtin_ctz(x);
#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
unsigned long result;
_BitScanForward(&result, v);
_BitScanForward(&result, x);
return result;
#else
return generic_ctz(x);