projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid sign compare warning.
[oota-llvm.git]
/
include
/
llvm
/
ADT
/
SmallPtrSet.h
diff --git
a/include/llvm/ADT/SmallPtrSet.h
b/include/llvm/ADT/SmallPtrSet.h
index f5af42dc4298b750ad6efe2868432135d1cbf050..498a0345d8bbd36eaf500ec93929146202b7a466 100644
(file)
--- a/
include/llvm/ADT/SmallPtrSet.h
+++ b/
include/llvm/ADT/SmallPtrSet.h
@@
-16,6
+16,7
@@
#define LLVM_ADT_SMALLPTRSET_H
#include <cassert>
#define LLVM_ADT_SMALLPTRSET_H
#include <cassert>
+#include <cstddef>
#include <cstring>
#include <iterator>
#include "llvm/Support/DataTypes.h"
#include <cstring>
#include <iterator>
#include "llvm/Support/DataTypes.h"
@@
-56,7
+57,7
@@
protected:
/// it, so that the end iterator actually points to valid memory.
unsigned CurArraySize;
/// it, so that the end iterator actually points to valid memory.
unsigned CurArraySize;
- // If small, this is # elts allocated conse
q
utively
+ // If small, this is # elts allocated conse
c
utively
unsigned NumElements;
unsigned NumTombstones;
unsigned NumElements;
unsigned NumTombstones;
@@
-125,17
+126,18
@@
protected:
private:
bool isSmall() const { return CurArray == SmallArray; }
private:
bool isSmall() const { return CurArray == SmallArray; }
- unsigned Hash(const void *Ptr) const {
- return static_cast<unsigned>(((uintptr_t)Ptr >> 4) & (CurArraySize-1));
- }
const void * const *FindBucketFor(const void *Ptr) const;
void shrink_and_clear();
/// Grow - Allocate a larger backing store for the buckets and move it over.
const void * const *FindBucketFor(const void *Ptr) const;
void shrink_and_clear();
/// Grow - Allocate a larger backing store for the buckets and move it over.
- void Grow();
+ void Grow(
unsigned NewSize
);
void operator=(const SmallPtrSetImpl &RHS); // DO NOT IMPLEMENT.
protected:
void operator=(const SmallPtrSetImpl &RHS); // DO NOT IMPLEMENT.
protected:
+ /// swap - Swaps the elements of two sets.
+ /// Note: This method assumes that both sets have the same small size.
+ void swap(SmallPtrSetImpl &RHS);
+
void CopyFrom(const SmallPtrSetImpl &RHS);
};
void CopyFrom(const SmallPtrSetImpl &RHS);
};
@@
-286,8
+288,20
@@
public:
return *this;
}
return *this;
}
+ /// swap - Swaps the elements of two sets.
+ void swap(SmallPtrSet<PtrType, SmallSize> &RHS) {
+ SmallPtrSetImpl::swap(RHS);
+ }
};
}
};
}
+namespace std {
+ /// Implement std::swap in terms of SmallPtrSet swap.
+ template<class T, unsigned N>
+ inline void swap(llvm::SmallPtrSet<T, N> &LHS, llvm::SmallPtrSet<T, N> &RHS) {
+ LHS.swap(RHS);
+ }
+}
+
#endif
#endif