From: Duncan P. N. Exon Smith <dexonsmith@apple.com>
Date: Fri, 26 Jun 2015 00:41:53 +0000 (+0000)
Subject: AsmPrinter: Explicitly scope iterator for MSVC
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=226f8f7de9d277af8f14d54f4a0b83f7326a1f8e;p=oota-llvm.git

AsmPrinter: Explicitly scope iterator for MSVC

Try to placate bots by explicitly scoping a conversion constructor from
`iterator` to `const_iterator`.

http://lab.llvm.org:8011/builders/sanitizer-windows/builds/5931/

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240748 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/CodeGen/DIE.h b/include/llvm/CodeGen/DIE.h
index d7938ca03c8..03487d46e52 100644
--- a/include/llvm/CodeGen/DIE.h
+++ b/include/llvm/CodeGen/DIE.h
@@ -512,7 +512,8 @@ public:
 
   public:
     const_iterator() = default;
-    const_iterator(iterator X) : N(X.N) {}
+    // Placate MSVC by explicitly scoping 'iterator'.
+    const_iterator(IntrusiveBackList::iterator X) : N(X.N) {}
     explicit const_iterator(const T *N) : N(N) {}
 
     const_iterator &operator++() {