diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2016-01-10 14:27:26 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2016-01-10 14:27:26 +0000 |
| commit | acad32d8e1e3b52a61c583f248e57a5cf59be4af (patch) | |
| tree | f426ec90a6c1413ccca385c83d7dabf6f8562be8 | |
| parent | 8b47610c32236595624f3f41fc9b4bba4e39ec49 (diff) | |
| download | bcm5719-llvm-acad32d8e1e3b52a61c583f248e57a5cf59be4af.tar.gz bcm5719-llvm-acad32d8e1e3b52a61c583f248e57a5cf59be4af.zip | |
[ADT] Another stab at fixing the PointerEmbeddedInt build for MSVC.
MSVC18 seems to have other problems here, just hardcode uintptr_t.
llvm-svn: 257289
| -rw-r--r-- | llvm/include/llvm/ADT/PointerEmbeddedInt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/ADT/PointerEmbeddedInt.h b/llvm/include/llvm/ADT/PointerEmbeddedInt.h index 5bd14c6173a..8781d1803ac 100644 --- a/llvm/include/llvm/ADT/PointerEmbeddedInt.h +++ b/llvm/include/llvm/ADT/PointerEmbeddedInt.h @@ -30,13 +30,13 @@ template <typename IntT, int Bits = sizeof(IntT) * CHAR_BIT> class PointerEmbeddedInt { uintptr_t Value; - static_assert(Bits < sizeof(PointerEmbeddedInt::Value) * CHAR_BIT, + static_assert(Bits < sizeof(uintptr_t) * CHAR_BIT, "Cannot embed more bits than we have in a pointer!"); enum : uintptr_t { // We shift as many zeros into the value as we can while preserving the // number of bits desired for the integer. - Shift = sizeof(PointerEmbeddedInt::Value) * CHAR_BIT - Bits, + Shift = sizeof(uintptr_t) * CHAR_BIT - Bits, // We also want to be able to mask out the preserved bits for asserts. Mask = static_cast<uintptr_t>(-1) << Bits |

