[llvm] r284661 - Revert "DenseSet: Appease msc18 to define derived constructors explicitly."

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Wed Oct 19 16:04:57 PDT 2016


Author: rnk
Date: Wed Oct 19 18:04:57 2016
New Revision: 284661

URL: http://llvm.org/viewvc/llvm-project?rev=284661&view=rev
Log:
Revert "DenseSet: Appease msc18 to define derived constructors explicitly."

This reverts commit r284570. MSVC 18 / 2013 is not supported anymore.

Modified:
    llvm/trunk/include/llvm/ADT/DenseSet.h

Modified: llvm/trunk/include/llvm/ADT/DenseSet.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/DenseSet.h?rev=284661&r1=284660&r2=284661&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/DenseSet.h (original)
+++ llvm/trunk/include/llvm/ADT/DenseSet.h Wed Oct 19 18:04:57 2016
@@ -210,13 +210,7 @@ class DenseSet : public detail::DenseSet
                            ValueInfoT>;
 
 public:
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  explicit DenseSet(unsigned InitialReserve = 0)
-      : DenseSetImpl(InitialReserve) {}
-  DenseSet(std::initializer_list<ValueT> Elems) : DenseSetImpl(Elems) {}
-#else
   using BaseT::BaseT;
-#endif
 };
 
 /// Implements a dense probed hash-table based set with some number of buckets
@@ -234,13 +228,7 @@ class SmallDenseSet
       ValueInfoT>;
 
 public:
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  explicit SmallDenseSet(unsigned InitialReserve = 0)
-      : DenseSetImpl(InitialReserve) {}
-  SmallDenseSet(std::initializer_list<ValueT> Elems) : DenseSetImpl(Elems) {}
-#else
   using BaseT::BaseT;
-#endif
 };
 
 } // end namespace llvm




More information about the llvm-commits mailing list