projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "ADT: Require explicit ilist iterator/pointer conversions"
[oota-llvm.git]
/
include
/
llvm
/
ADT
/
ilist.h
diff --git
a/include/llvm/ADT/ilist.h
b/include/llvm/ADT/ilist.h
index c34434a1f76871036e72668d96549829b543f743..371518a04cab17c2a4ee2939fe917013ef5bc127 100644
(file)
--- a/
include/llvm/ADT/ilist.h
+++ b/
include/llvm/ADT/ilist.h
@@
-220,8
+220,8
@@
private:
template<class T> void operator-(T) const;
public:
template<class T> void operator-(T) const;
public:
-
explicit
ilist_iterator(pointer NP) : NodePtr(NP) {}
-
explicit
ilist_iterator(reference NR) : NodePtr(&NR) {}
+ ilist_iterator(pointer NP) : NodePtr(NP) {}
+ ilist_iterator(reference NR) : NodePtr(&NR) {}
ilist_iterator() : NodePtr(nullptr) {}
// This is templated so that we can allow constructing a const iterator from
ilist_iterator() : NodePtr(nullptr) {}
// This is templated so that we can allow constructing a const iterator from
@@
-241,7
+241,7
@@
public:
void reset(pointer NP) { NodePtr = NP; }
// Accessors...
void reset(pointer NP) { NodePtr = NP; }
// Accessors...
-
explicit
operator pointer() const {
+ operator pointer() const {
return NodePtr;
}
return NodePtr;
}