From: Duncan P. N. Exon Smith Date: Sat, 7 Nov 2015 00:09:14 +0000 (+0000) Subject: Revert "ADT: Require explicit ilist iterator/pointer conversions" X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d81c5525e10168bb6ce5232b2f41ad825893162e;p=oota-llvm.git Revert "ADT: Require explicit ilist iterator/pointer conversions" This reverts commit r252372. Apparently I missed clang-tools-extra. http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/2534/steps/build/logs/stdio git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@252373 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/ADT/ilist.h b/include/llvm/ADT/ilist.h index c34434a1f76..371518a04ca 100644 --- a/include/llvm/ADT/ilist.h +++ b/include/llvm/ADT/ilist.h @@ -220,8 +220,8 @@ private: template 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 @@ -241,7 +241,7 @@ public: void reset(pointer NP) { NodePtr = NP; } // Accessors... - explicit operator pointer() const { + operator pointer() const { return NodePtr; }