llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-24 03:32:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert 313789 because gcc doesn't like it

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@313803 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-09-20 19:38:43 +00:00
parent 9641305bba
commit 1e32db7b33
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/algorithm
View File

@@ -2962,8 +2962,8 @@ public:
result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());} result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
private: private:
result_type __eval(false_type) const; result_type __eval(false_type);
result_type __eval(true_type) const; result_type __eval(true_type);
}; };
template<class _Engine, class _UIntType> template<class _Engine, class _UIntType>
@@ -3004,14 +3004,14 @@ __independent_bits_engine<_Engine, _UIntType>
template<class _Engine, class _UIntType> template<class _Engine, class _UIntType>
inline inline
_UIntType _UIntType
__independent_bits_engine<_Engine, _UIntType>::__eval(false_type) const __independent_bits_engine<_Engine, _UIntType>::__eval(false_type)
{ {
return static_cast<result_type>(__e_() & __mask0_); return static_cast<result_type>(__e_() & __mask0_);
} }
template<class _Engine, class _UIntType> template<class _Engine, class _UIntType>
_UIntType _UIntType
__independent_bits_engine<_Engine, _UIntType>::__eval(true_type) const __independent_bits_engine<_Engine, _UIntType>::__eval(true_type)
{ {
const size_t _WRt = numeric_limits<result_type>::digits; const size_t _WRt = numeric_limits<result_type>::digits;
result_type _Sp = 0; result_type _Sp = 0;

8
include/random
View File

@@ -3124,8 +3124,8 @@ public:
private: private:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
result_type __eval(false_type) const; result_type __eval(false_type);
result_type __eval(true_type) const; result_type __eval(true_type);
template <size_t __count> template <size_t __count>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
@@ -3151,14 +3151,14 @@ private:
template<class _Engine, size_t __w, class _UIntType> template<class _Engine, size_t __w, class _UIntType>
inline inline
_UIntType _UIntType
independent_bits_engine<_Engine, __w, _UIntType>::__eval(false_type) const independent_bits_engine<_Engine, __w, _UIntType>::__eval(false_type)
{ {
return static_cast<result_type>(__e_() & __mask0); return static_cast<result_type>(__e_() & __mask0);
} }
template<class _Engine, size_t __w, class _UIntType> template<class _Engine, size_t __w, class _UIntType>
_UIntType _UIntType
independent_bits_engine<_Engine, __w, _UIntType>::__eval(true_type) const independent_bits_engine<_Engine, __w, _UIntType>::__eval(true_type)
{ {
result_type _Sp = 0; result_type _Sp = 0;
for (size_t __k = 0; __k < __n0; ++__k) for (size_t __k = 0; __k < __n0; ++__k)