diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-27 15:59:32 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-27 15:59:32 +0000 |
| commit | 075f1e6a2b7478168663ce53fd4ba2df3a94bcec (patch) | |
| tree | 375101d9a84e5b23abd79fb273fb36992ac4a5f5 /contrib/libc++ | |
| parent | 68629f0dce9d5019ce0cd4371a3d6ae65a322f81 (diff) | |
| download | src-075f1e6a2b7478168663ce53fd4ba2df3a94bcec.tar.gz src-075f1e6a2b7478168663ce53fd4ba2df3a94bcec.zip | |
Tentatively apply https://reviews.llvm.org/D23960, to squelch errors
about narrowing in <bitset>.
Notes
Notes:
svn path=/projects/clang390-import/; revision=304913
Diffstat (limited to 'contrib/libc++')
| -rw-r--r-- | contrib/libc++/include/bitset | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libc++/include/bitset b/contrib/libc++/include/bitset index 87d7afca5a73..21b2e2408f64 100644 --- a/contrib/libc++/include/bitset +++ b/contrib/libc++/include/bitset @@ -262,7 +262,7 @@ __bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT #if __SIZEOF_SIZE_T__ == 8 : __first_{__v} #elif __SIZEOF_SIZE_T__ == 4 - : __first_{__v, __v >> __bits_per_word} + : __first_{static_cast<__storage_type>(__v), static_cast<__storage_type>(__v >> __bits_per_word)} #else #error This constructor has not been ported to this platform #endif |