From bf745a628fe8140873cd887ae217e1a006a48f35 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames@gmail.com>
Date: Tue, 25 Sep 2018 20:48:57 +0000
Subject: [PATCH] Remove 'orc' namespace from MSVCErrorWorkarounds.h, fix some
 typos that were breaking windows builds.

The 'orc' namespace was accidentally left in when the workarounds were moved
out of orc in r343011.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@343025 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Support/MSVCErrorWorkarounds.h            | 2 --
 lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp        | 2 +-
 lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/llvm/Support/MSVCErrorWorkarounds.h b/include/llvm/Support/MSVCErrorWorkarounds.h
index 13c78358e5cd..053ecf64d1e9 100644
--- a/include/llvm/Support/MSVCErrorWorkarounds.h
+++ b/include/llvm/Support/MSVCErrorWorkarounds.h
@@ -22,7 +22,6 @@
 #include "llvm/Support/Error.h"
 
 namespace llvm {
-namespace orc {
 
 // A default-constructible llvm::Error that is suitable for use with MSVC's
 // std::future implementation which requires default constructible types.
@@ -80,7 +79,6 @@ template <typename T> class MSVCPExpected : public Expected<T> {
       : Expected<T>(std::move(Other)) {}
 };
 
-} // end namespace orc
 } // end namespace llvm
 
 #endif // LLVM_SUPPORT_MSVCERRORWORKAROUNDS_H
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index e96ba98a1808..563a9725142e 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -1087,7 +1087,7 @@ Error RuntimeDyldImpl::resolveExternalSymbols() {
 
 #ifdef _MSC_VER
       using ExpectedLookupResult =
-          MSVCPExpected<JITSymbolResolver::LooupResult>;
+          MSVCPExpected<JITSymbolResolver::LookupResult>;
 #else
       using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>;
 #endif
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
index 775a5394ede3..6eb6256080ff 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
@@ -735,7 +735,7 @@ Expected<JITSymbolResolver::LookupResult> RuntimeDyldCheckerImpl::lookup(
     const JITSymbolResolver::LookupSet &Symbols) const {
 
 #ifdef _MSC_VER
-  using ExpectedLookupResult = MSVCPExpected<JITSymbolResolver::LooupResult>;
+  using ExpectedLookupResult = MSVCPExpected<JITSymbolResolver::LookupResult>;
 #else
   using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>;
 #endif