Remove uses of _UI because Windows is evil and tchar.h #define's it

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@304348 91177308-0d34-0410-b5e6-96231b3b80d8
2017-05-31 21:20:18 +00:00
parent bed65743b4
commit ac633a2a52
3 changed files with 113 additions and 111 deletions
--- a/include/algorithm
+++ b/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>