From 89918caaa7fd4f3d82e643d9f4f955d2de8eb254 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 31 May 2017 21:20:18 +0000
Subject: Remove uses of _UI because Windows is evil and tchar.h #define's it

llvm-svn: 304348
---
 libcxx/include/algorithm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libcxx/include/algorithm')

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>
-- 
cgit v1.2.3