Skip to content

Commit

Permalink
Remove 'orc' namespace from MSVCErrorWorkarounds.h, fix some typos th…
Browse files Browse the repository at this point in the history
…at 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
  • Loading branch information
lhames committed Sep 25, 2018
1 parent a3c2b35 commit bf745a6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions include/llvm/Support/MSVCErrorWorkarounds.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bf745a6

Please sign in to comment.