maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Lang Hames 2018-09-25 20:48:57 +00:00
parent 12ef7a9575
commit 079c0df47d
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/Support/MSVCErrorWorkarounds.h
View File

@ -22,7 +22,6 @@
#include "llvm/Support/Error.h" #include "llvm/Support/Error.h"
namespace llvm { namespace llvm {
namespace orc {
// A default-constructible llvm::Error that is suitable for use with MSVC's // A default-constructible llvm::Error that is suitable for use with MSVC's
// std::future implementation which requires default constructible types. // std::future implementation which requires default constructible types.
@ -80,7 +79,6 @@ public:
: Expected<T>(std::move(Other)) {} : Expected<T>(std::move(Other)) {}
}; };
} // end namespace orc
} // end namespace llvm } // end namespace llvm
#endif // LLVM_SUPPORT_MSVCERRORWORKAROUNDS_H #endif // LLVM_SUPPORT_MSVCERRORWORKAROUNDS_H

2
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
View File

@ -1087,7 +1087,7 @@ Error RuntimeDyldImpl::resolveExternalSymbols() {
#ifdef _MSC_VER #ifdef _MSC_VER
using ExpectedLookupResult = using ExpectedLookupResult =
MSVCPExpected<JITSymbolResolver::LooupResult>; MSVCPExpected<JITSymbolResolver::LookupResult>;
#else #else
using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>; using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>;
#endif #endif

2
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
View File

@ -735,7 +735,7 @@ Expected<JITSymbolResolver::LookupResult> RuntimeDyldCheckerImpl::lookup(
const JITSymbolResolver::LookupSet &Symbols) const { const JITSymbolResolver::LookupSet &Symbols) const {
#ifdef _MSC_VER #ifdef _MSC_VER
using ExpectedLookupResult = MSVCPExpected<JITSymbolResolver::LooupResult>; using ExpectedLookupResult = MSVCPExpected<JITSymbolResolver::LookupResult>;
#else #else
using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>; using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>;
#endif #endif