Mark ImmutableMap::remove/add() const.

[oota-llvm.git] / include / llvm / ADT / BitVector.h

diff --git a/include/llvm/ADT/BitVector.h b/include/llvm/ADT/BitVector.h
index 4523828d454bb88c1e3215258c932d7e9f4ea944..82cfdf437d4e7f7cd827ca96ed70897c4b9db697 100644 (file)
--- a/include/llvm/ADT/BitVector.h
+++ b/include/llvm/ADT/BitVector.h
@@ -98,7 +98,7 @@ public:
     std::memcpy(Bits, RHS.Bits, Capacity * sizeof(BitWord));
   }
 
-#if LLVM_USE_RVALUE_REFERENCES
+#if LLVM_HAS_RVALUE_REFERENCES
   BitVector(BitVector &&RHS)
     : Bits(RHS.Bits), Size(RHS.Size), Capacity(RHS.Capacity) {
     RHS.Bits = 0;
@@ -244,9 +244,9 @@ public:
 
     if (I == E) return *this;
 
-    if (I / BITWORD_SIZE == (E-1) / BITWORD_SIZE) {
-      BitWord EMask = 1 << (E % BITWORD_SIZE);
-      BitWord IMask = 1 << (I % BITWORD_SIZE);
+    if (I / BITWORD_SIZE == E / BITWORD_SIZE) {
+      BitWord EMask = 1UL << (E % BITWORD_SIZE);
+      BitWord IMask = 1UL << (I % BITWORD_SIZE);
       BitWord Mask = EMask - IMask;
       Bits[I / BITWORD_SIZE] |= Mask;
       return *this;
@@ -282,9 +282,9 @@ public:
 
     if (I == E) return *this;
 
-    if (I / BITWORD_SIZE == (E-1) / BITWORD_SIZE) {
-      BitWord EMask = 1 << (E % BITWORD_SIZE);
-      BitWord IMask = 1 << (I % BITWORD_SIZE);
+    if (I / BITWORD_SIZE == E / BITWORD_SIZE) {
+      BitWord EMask = 1UL << (E % BITWORD_SIZE);
+      BitWord IMask = 1UL << (I % BITWORD_SIZE);
       BitWord Mask = EMask - IMask;
       Bits[I / BITWORD_SIZE] &= ~Mask;
       return *this;
@@ -452,7 +452,7 @@ public:
     return *this;
   }
 
-#if LLVM_USE_RVALUE_REFERENCES
+#if LLVM_HAS_RVALUE_REFERENCES
   const BitVector &operator=(BitVector &&RHS) {
     if (this == &RHS) return *this;