From 19f1dc7b527eade11dae9425c420cc9f450393b6 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 31 Oct 2019 14:18:38 -0700 Subject: [PATCH] Remove unneeded template alias, causes issues with some MSVC version I built locally with the latest MSVC in c++14 and c++17, but it does not complain for me. Osman Zakir on llvm-dev reports that they run into compile errors here. In any case, it seems prefereable to reuse clang's LLVM.h header to bring in llvm::Optional and Expected. --- clang/lib/AST/Interp/ByteCodeStmtGen.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/clang/lib/AST/Interp/ByteCodeStmtGen.cpp b/clang/lib/AST/Interp/ByteCodeStmtGen.cpp index c713015..5b47489 100644 --- a/clang/lib/AST/Interp/ByteCodeStmtGen.cpp +++ b/clang/lib/AST/Interp/ByteCodeStmtGen.cpp @@ -14,13 +14,11 @@ #include "PrimType.h" #include "Program.h" #include "State.h" +#include "clang/Basic/LLVM.h" using namespace clang; using namespace clang::interp; -template using Expected = llvm::Expected; -template using Optional = llvm::Optional; - namespace clang { namespace interp { -- 2.7.4