diff options
| author | Lang Hames <lhames@gmail.com> | 2018-09-25 20:48:57 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2018-09-25 20:48:57 +0000 |
| commit | 079c0df47d0c02cba335a014a5034aa4bc91b5cb (patch) | |
| tree | 2b47f33f5e3b99a246f00db82533795a4e94b9b1 | |
| parent | 12ef7a957531877d86a9bf39e12f059102db4e56 (diff) | |
| download | bcm5719-llvm-079c0df47d0c02cba335a014a5034aa4bc91b5cb.tar.gz bcm5719-llvm-079c0df47d0c02cba335a014a5034aa4bc91b5cb.zip | |
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
| -rw-r--r-- | llvm/include/llvm/Support/MSVCErrorWorkarounds.h | 2 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/llvm/include/llvm/Support/MSVCErrorWorkarounds.h b/llvm/include/llvm/Support/MSVCErrorWorkarounds.h index 13c78358e5c..053ecf64d1e 100644 --- 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 e96ba98a180..563a9725142 100644 --- 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 775a5394ede..6eb6256080f 100644 --- 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 |
