projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for PR3946, in which SmallVector could behave strangely in corner cases.
[oota-llvm.git]
/
include
/
llvm
/
ADT
/
DenseSet.h
diff --git
a/include/llvm/ADT/DenseSet.h
b/include/llvm/ADT/DenseSet.h
index 778b6bafc0b1bede67eb07fcc9d43e6c48ca2cf0..ce7344bc1f99b3eab218817559d9f3300cf8a182 100644
(file)
--- a/
include/llvm/ADT/DenseSet.h
+++ b/
include/llvm/ADT/DenseSet.h
@@
-29,65
+29,74
@@
class DenseSet {
public:
DenseSet(const DenseSet &Other) : TheMap(Other.TheMap) {}
explicit DenseSet(unsigned NumInitBuckets = 64) : TheMap(NumInitBuckets) {}
public:
DenseSet(const DenseSet &Other) : TheMap(Other.TheMap) {}
explicit DenseSet(unsigned NumInitBuckets = 64) : TheMap(NumInitBuckets) {}
-
+
bool empty() const { return TheMap.empty(); }
bool empty() const { return TheMap.empty(); }
- unsigned size() const { return TheMap.size(); }
-
+ unsigned size() const { return TheMap.size(); }
+
void clear() {
TheMap.clear();
}
void clear() {
TheMap.clear();
}
-
+
bool count(const ValueT &V) const {
return TheMap.count(V);
}
bool count(const ValueT &V) const {
return TheMap.count(V);
}
-
- void insert(const ValueT &V) {
- TheMap[V] = 0;
- }
-
+
void erase(const ValueT &V) {
TheMap.erase(V);
}
void erase(const ValueT &V) {
TheMap.erase(V);
}
-
+
DenseSet &operator=(const DenseSet &RHS) {
TheMap = RHS.TheMap;
return *this;
}
DenseSet &operator=(const DenseSet &RHS) {
TheMap = RHS.TheMap;
return *this;
}
-
+
// Iterators.
// Iterators.
-
+
class Iterator {
typename MapTy::iterator I;
public:
Iterator(const typename MapTy::iterator &i) : I(i) {}
class Iterator {
typename MapTy::iterator I;
public:
Iterator(const typename MapTy::iterator &i) : I(i) {}
-
+
ValueT& operator*() { return I->first; }
ValueT* operator->() { return &I->first; }
ValueT& operator*() { return I->first; }
ValueT* operator->() { return &I->first; }
-
+
Iterator& operator++() { ++I; return *this; };
bool operator==(const Iterator& X) const { return I == X.I; }
Iterator& operator++() { ++I; return *this; };
bool operator==(const Iterator& X) const { return I == X.I; }
+ bool operator!=(const Iterator& X) const { return I != X.I; }
};
};
-
+
class ConstIterator {
typename MapTy::const_iterator I;
public:
ConstIterator(const typename MapTy::const_iterator &i) : I(i) {}
class ConstIterator {
typename MapTy::const_iterator I;
public:
ConstIterator(const typename MapTy::const_iterator &i) : I(i) {}
-
+
const ValueT& operator*() { return I->first; }
const ValueT* operator->() { return &I->first; }
const ValueT& operator*() { return I->first; }
const ValueT* operator->() { return &I->first; }
-
+
ConstIterator& operator++() { ++I; return *this; };
bool operator==(const ConstIterator& X) const { return I == X.I; }
ConstIterator& operator++() { ++I; return *this; };
bool operator==(const ConstIterator& X) const { return I == X.I; }
+ bool operator!=(const ConstIterator& X) const { return I != X.I; }
};
};
-
+
typedef Iterator iterator;
typedef ConstIterator const_iterator;
typedef Iterator iterator;
typedef ConstIterator const_iterator;
-
+
iterator begin() { return Iterator(TheMap.begin()); }
iterator end() { return Iterator(TheMap.end()); }
iterator begin() { return Iterator(TheMap.begin()); }
iterator end() { return Iterator(TheMap.end()); }
-
+
const_iterator begin() const { return ConstIterator(TheMap.begin()); }
const_iterator end() const { return ConstIterator(TheMap.end()); }
const_iterator begin() const { return ConstIterator(TheMap.begin()); }
const_iterator end() const { return ConstIterator(TheMap.end()); }
+
+ std::pair<iterator, bool> insert(const ValueT &V) {
+ return TheMap.insert(std::make_pair(V, 0));
+ }
+
+ // Range insertion of values.
+ template<typename InputIt>
+ void insert(InputIt I, InputIt E) {
+ for (; I != E; ++I)
+ insert(*I);
+ }
};
} // end namespace llvm
};
} // end namespace llvm