diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2017-09-20 19:38:43 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2017-09-20 19:38:43 +0000 |
| commit | 08bba64a1009b48907ba678b59170a7fe9bcc091 (patch) | |
| tree | 8df42532317bbe3dec3244ffa7eda2eef56ce2aa /libcxx | |
| parent | 531aec2e9033c7c2035bebcbbac9a407a7790191 (diff) | |
| download | bcm5719-llvm-08bba64a1009b48907ba678b59170a7fe9bcc091.tar.gz bcm5719-llvm-08bba64a1009b48907ba678b59170a7fe9bcc091.zip | |
Revert 313789 because gcc doesn't like it
llvm-svn: 313803
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/algorithm | 8 | ||||
| -rw-r--r-- | libcxx/include/random | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 036b42ceda5..282083a89c2 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -2962,8 +2962,8 @@ public: result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());} private: - result_type __eval(false_type) const; - result_type __eval(true_type) const; + result_type __eval(false_type); + result_type __eval(true_type); }; template<class _Engine, class _UIntType> @@ -3004,14 +3004,14 @@ __independent_bits_engine<_Engine, _UIntType> template<class _Engine, class _UIntType> inline _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_); } template<class _Engine, class _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; result_type _Sp = 0; diff --git a/libcxx/include/random b/libcxx/include/random index 85a1cca5d0e..9073a5285b1 100644 --- a/libcxx/include/random +++ b/libcxx/include/random @@ -3124,8 +3124,8 @@ public: private: _LIBCPP_INLINE_VISIBILITY - result_type __eval(false_type) const; - result_type __eval(true_type) const; + result_type __eval(false_type); + result_type __eval(true_type); template <size_t __count> _LIBCPP_INLINE_VISIBILITY @@ -3151,14 +3151,14 @@ private: template<class _Engine, size_t __w, class _UIntType> inline _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); } template<class _Engine, size_t __w, class _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; for (size_t __k = 0; __k < __n0; ++__k) |
