<div dir="ltr">r284661</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 19, 2016 at 3:36 PM, Reid Kleckner <span dir="ltr"><<a href="mailto:rnk@google.com" target="_blank">rnk@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'm going to revert this, MSVC 2013 (_MSC_VER < 1900) is no longer supported as of Oct 15. Please upgrade to MSVC 2015.</div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 18, 2016 at 10:43 PM, NAKAMURA Takumi via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chapuni<br>
Date: Wed Oct 19 00:43:17 2016<br>
New Revision: 284570<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=284570&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=284570&view=rev</a><br>
Log:<br>
DenseSet: Appease msc18 to define derived constructors explicitly.<br>
<br>
msc18 doesn't recognize "using BaseT::BaseT;"<br>
<br>
  llvm\include\llvm/ADT/DenseSet<wbr>.h(213) : error C2875: using-declaration causes a multiple declaration of 'BaseT'<br>
          llvm\include\llvm/ADT/DenseSet<wbr>.h(214) : see reference to class template instantiation 'llvm::DenseSet<ValueT,ValueIn<wbr>foT>' being compiled<br>
  llvm\include\llvm/ADT/DenseSet<wbr>.h(231) : error C2875: using-declaration causes a multiple declaration of 'BaseT'<br>
          llvm\include\llvm/ADT/DenseSet<wbr>.h(232) : see reference to class template instantiation 'llvm::SmallDenseSet<ValueT,In<wbr>lineBuckets,ValueInfoT>' being compiled<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/ADT/De<wbr>nseSet.h<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/De<wbr>nseSet.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/DenseSet.h?rev=284570&r1=284569&r2=284570&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>ADT/DenseSet.h?rev=284570&r1=<wbr>284569&r2=284570&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/ADT/De<wbr>nseSet.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/De<wbr>nseSet.h Wed Oct 19 00:43:17 2016<br>
@@ -210,7 +210,13 @@ class DenseSet : public detail::DenseSet<br>
                            ValueInfoT>;<br>
<br>
 public:<br>
+#if defined(_MSC_VER) && _MSC_VER < 1900<br>
+  explicit DenseSet(unsigned InitialReserve = 0)<br>
+      : DenseSetImpl(InitialReserve) {}<br>
+  DenseSet(std::initializer_list<wbr><ValueT> Elems) : DenseSetImpl(Elems) {}<br>
+#else<br>
   using BaseT::BaseT;<br>
+#endif<br>
 };<br>
<br>
 /// Implements a dense probed hash-table based set with some number of buckets<br>
@@ -228,7 +234,13 @@ class SmallDenseSet<br>
       ValueInfoT>;<br>
<br>
 public:<br>
+#if defined(_MSC_VER) && _MSC_VER < 1900<br>
+  explicit SmallDenseSet(unsigned InitialReserve = 0)<br>
+      : DenseSetImpl(InitialReserve) {}<br>
+  SmallDenseSet(std::initializer<wbr>_list<ValueT> Elems) : DenseSetImpl(Elems) {}<br>
+#else<br>
   using BaseT::BaseT;<br>
+#endif<br>
 };<br>
<br>
 } // end namespace llvm<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>