diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-04-02 21:00:45 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-04-02 21:00:45 +0000 |
| commit | e386b7b360d6508f974db64d43d13129e36e2b22 (patch) | |
| tree | c3d32fbea80d078764ae59bcd575ab7179aa061d /libcxx/include/algorithm | |
| parent | 9b7efd5bb617fae759c9ebe7fb4f72c989027fd8 (diff) | |
| download | bcm5719-llvm-e386b7b360d6508f974db64d43d13129e36e2b22.tar.gz bcm5719-llvm-e386b7b360d6508f974db64d43d13129e36e2b22.zip | |
Update <random> with constexpr support. Patch contributed by Jonathan Sauer.
llvm-svn: 153896
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 68e989a0be1..d924a7de3f2 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -2508,11 +2508,16 @@ private: _Engine_result_type __mask0_; _Engine_result_type __mask1_; +#ifdef _LIBCPP_HAS_NO_CONSTEXPR static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min - + _Working_result_type(1); - static const size_t __m = __log2<_Working_result_type, _Rp>::value; - static const size_t _WDt = numeric_limits<_Working_result_type>::digits; - static const size_t _EDt = numeric_limits<_Engine_result_type>::digits; + + _Working_result_type(1); +#else + static _LIBCPP_CONSTEXPR const _Working_result_type _Rp = _Engine::max() - _Engine::min() + + _Working_result_type(1); +#endif + static _LIBCPP_CONSTEXPR const size_t __m = __log2<_Working_result_type, _Rp>::value; + static _LIBCPP_CONSTEXPR const size_t _WDt = numeric_limits<_Working_result_type>::digits; + static _LIBCPP_CONSTEXPR const size_t _EDt = numeric_limits<_Engine_result_type>::digits; public: // constructors and seeding functions |
