diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-01 20:59:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-01 20:59:10 +0000 |
| commit | edb11085302f80f38c9d976f003aa1c9002c7abb (patch) | |
| tree | edfe9dcac670e9f47ee7fdee893130fcf86ba196 /include/algorithm | |
| parent | 10a0bef720b6882fce588a10b07b0584d62eac76 (diff) | |
Notes
Diffstat (limited to 'include/algorithm')
| -rw-r--r-- | include/algorithm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/algorithm b/include/algorithm index 7ea4474a1bb4..9fe0361e577d 100644 --- a/include/algorithm +++ b/include/algorithm @@ -651,14 +651,16 @@ template <class BidirectionalIterator, class Compare> #include <intrin.h> #endif -#include <__undef_min_max> - #include <__debug> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + + _LIBCPP_BEGIN_NAMESPACE_STD // I'd like to replace these with _VSTD::equal_to<void>, but can't because: @@ -2908,11 +2910,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> @@ -5904,4 +5906,6 @@ prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last) _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP_ALGORITHM |