Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid error C2156 under VC++2013 #121

Merged
merged 1 commit into from
Feb 25, 2015
Merged

Avoid error C2156 under VC++2013 #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,14 @@ inline uint32_t clz(uint32_t x) {
return 31 - r;
}
# define FMT_BUILTIN_CLZ(n) fmt::internal::clz(n)

# ifdef _WIN64
# pragma intrinsic(_BitScanReverse64)
# endif

inline uint32_t clzll(uint64_t x) {
unsigned long r = 0;
# ifdef _WIN64
# pragma intrinsic(_BitScanReverse64)
_BitScanReverse64(&r, x);
# else
// Scan the high 32 bits.
Expand Down