Attempt to fix Linux builds after r228960.

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

diff --git a/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h b/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
index 6039709b597cb8b69dbedffac4a8fb8bc16ccd18..1c47ffe7480e991146aa8475f31d370a9af40d5c 100644 (file)
--- a/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
+++ b/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
@@ -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));
   }

diff --git a/include/llvm/DebugInfo/PDB/PDBSymbol.h b/include/llvm/DebugInfo/PDB/PDBSymbol.h
index 9aa2da0b1f87428875550969d3ab6b0c9d5402c3..391b1f79016b70f4800a29637174711927514cc9 100644 (file)
--- a/include/llvm/DebugInfo/PDB/PDBSymbol.h
+++ b/include/llvm/DebugInfo/PDB/PDBSymbol.h
@@ -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;