diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-31 21:20:18 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-31 21:20:18 +0000 |
| commit | 89918caaa7fd4f3d82e643d9f4f955d2de8eb254 (patch) | |
| tree | 5878b3ad43836e76fe7412d3c5352f64a5558a16 /libcxx/include/algorithm | |
| parent | bcd3c37f4a4f6d7b6b66984bf69a69b85364b017 (diff) | |
| download | bcm5719-llvm-89918caaa7fd4f3d82e643d9f4f955d2de8eb254.tar.gz bcm5719-llvm-89918caaa7fd4f3d82e643d9f4f955d2de8eb254.zip | |
Remove uses of _UI because Windows is evil and tchar.h #define's it
llvm-svn: 304348
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 7ea4474a1bb..71440508e9c 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -2908,11 +2908,11 @@ struct __log2_imp<0, _Rp> static const size_t value = _Rp + 1; }; -template <class _UI, _UI _Xp> +template <class _UIntType, _UIntType _Xp> struct __log2 { static const size_t value = __log2_imp<_Xp, - sizeof(_UI) * __CHAR_BIT__ - 1>::value; + sizeof(_UIntType) * __CHAR_BIT__ - 1>::value; }; template<class _Engine, class _UIntType> |
