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

llvm-svn: 304348
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 89918caaa7fd4f3d82e643d9f4f955d2de8eb254
diff --git a/include/algorithm b/include/algorithm
index 7ea4474..7144050 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -2908,11 +2908,11 @@
     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>