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.

llvm-svn: 343025

diff --git a/llvm/include/llvm/Support/MSVCErrorWorkarounds.h b/llvm/include/llvm/Support/MSVCErrorWorkarounds.h
index 13c78358e5cdf5987cf26dbd7b218e977c1cdb79..053ecf64d1e9d200cdfc9e58c5b38c545a6504e5 100644 (file)
--- a/llvm/include/llvm/Support/MSVCErrorWorkarounds.h
+++ b/llvm/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 @@ public:
       : Expected<T>(std::move(Other)) {}
 };
 
-} // end namespace orc
 } // end namespace llvm
 
 #endif // LLVM_SUPPORT_MSVCERRORWORKAROUNDS_H

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index e96ba98a1808a53df47e711d47d9b6318eda7e01..563a9725142e36b00eba642134f6a69cc54b6d11 100644 (file)
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/llvm/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/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
index 775a5394ede3e609c03db2f67064af0e78c3befc..6eb6256080ff4ced15a3d747e76c2489cc74b7d9 100644 (file)
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
+++ b/llvm/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