[llvm] r228962 - Attempt to fix Linux builds after r228960.

[Zachary Turner]

Author: zturner
Date: Thu Feb 12 15:17:07 2015
New Revision: 228962

URL: http://llvm.org/viewvc/llvm-project?rev=228962&view=rev
Log:
Attempt to fix Linux builds after r228960.

Modified:
    llvm/trunk/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
    llvm/trunk/include/llvm/DebugInfo/PDB/PDBSymbol.h

Modified: llvm/trunk/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h?rev=228962&r1=228961&r2=228962&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h Thu Feb 12 15:17:07 2015
@@ -39,7 +39,7 @@ public:
 
   void reset() { Enumerator->reset(); }
 
-  MyType *clone() const {
+  IPDBEnumChildren<ChildType>::MyType *clone() const {
     std::unique_ptr<IPDBEnumSymbols> WrappedClone(Enumerator->clone());
     return new ConcreteSymbolEnumerator<ChildType>(std::move(WrappedClone));
   }

Modified: llvm/trunk/include/llvm/DebugInfo/PDB/PDBSymbol.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/PDB/PDBSymbol.h?rev=228962&r1=228961&r2=228962&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/PDB/PDBSymbol.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/PDB/PDBSymbol.h Thu Feb 12 15:17:07 2015
@@ -10,9 +10,9 @@
 #ifndef LLVM_DEBUGINFO_PDB_IPDBSYMBOL_H
 #define LLVM_DEBUGINFO_PDB_IPDBSYMBOL_H
 
-#include <memory>
 #include <unordered_map>
 
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Casting.h"
 
@@ -68,7 +68,7 @@ public:
   template <typename T>
   std::unique_ptr<ConcreteSymbolEnumerator<T>> findAllChildren() const {
     auto BaseIter = RawSymbol->findChildren(T::Tag);
-    return std::make_unique<ConcreteSymbolEnumerator<T>>(std::move(BaseIter));
+    return llvm::make_unique<ConcreteSymbolEnumerator<T>>(std::move(BaseIter));
   }
 
   std::unique_ptr<IPDBEnumSymbols> findAllChildren() const;