summaryrefslogtreecommitdiffstats
path: root/libcxx/include/algorithm
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2017-09-20 19:38:43 +0000
committerMarshall Clow <mclow.lists@gmail.com>2017-09-20 19:38:43 +0000
commit08bba64a1009b48907ba678b59170a7fe9bcc091 (patch)
tree8df42532317bbe3dec3244ffa7eda2eef56ce2aa /libcxx/include/algorithm
parent531aec2e9033c7c2035bebcbbac9a407a7790191 (diff)
downloadbcm5719-llvm-08bba64a1009b48907ba678b59170a7fe9bcc091.tar.gz
bcm5719-llvm-08bba64a1009b48907ba678b59170a7fe9bcc091.zip
Revert 313789 because gcc doesn't like it
llvm-svn: 313803
Diffstat (limited to 'libcxx/include/algorithm')
-rw-r--r--libcxx/include/algorithm8
1 files changed, 4 insertions, 4 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;
OpenPOWER on IntegriCloud