From: Michael Gottesman <mgottesman@apple.com>
Date: Thu, 1 Jan 2015 13:54:05 +0000 (+0000)
Subject: Revert "Just use a using directive in SmallMapVector instead of inheriting from MapVe... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=31379e2e6919814f0a468a2a15bdd9afceba431f;p=oota-llvm.git

Revert "Just use a using directive in SmallMapVector instead of inheriting from MapVector itself."

This reverts commit r225059. I think MSVC 2012 has a problem with this. This is
an attempt to fix one of the MSVC 2012 bots.

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

diff --git a/include/llvm/ADT/MapVector.h b/include/llvm/ADT/MapVector.h
index b10db611484..0727383310a 100644
--- a/include/llvm/ADT/MapVector.h
+++ b/include/llvm/ADT/MapVector.h
@@ -185,9 +185,12 @@ void MapVector<KeyT, ValueT, MapType, VectorType>::remove_if(Function Pred) {
 /// \brief A MapVector that performs no allocations if smaller than a certain
 /// size.
 template <typename KeyT, typename ValueT, unsigned N>
-using SmallMapVector =
-  MapVector<KeyT, ValueT, SmallDenseMap<KeyT, unsigned, N>,
-            SmallVector<std::pair<KeyT, ValueT>, N>>;
+class SmallMapVector
+    : public MapVector<KeyT, ValueT, SmallDenseMap<KeyT, unsigned, N>,
+                       SmallVector<std::pair<KeyT, ValueT>, N>> {
+public:
+  SmallMapVector() {}
+};
 
 } // end namespace llvm