[llvm] r225065 - Revert "Just use a using directive in SmallMapVector instead of inheriting from MapVector itself."

[Michael Gottesman]

Author: mgottesman
Date: Thu Jan  1 07:54:05 2015
New Revision: 225065

URL: http://llvm.org/viewvc/llvm-project?rev=225065&view=rev
Log:
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.

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

Modified: llvm/trunk/include/llvm/ADT/MapVector.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/MapVector.h?rev=225065&r1=225064&r2=225065&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/MapVector.h (original)
+++ llvm/trunk/include/llvm/ADT/MapVector.h Thu Jan  1 07:54:05 2015
@@ -185,9 +185,12 @@ void MapVector<KeyT, ValueT, MapType, Ve
 /// \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