[llvm] r343025 - Remove 'orc' namespace from MSVCErrorWorkarounds.h, fix some typos that were
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 25 13:48:58 PDT 2018
Author: lhames
Date: Tue Sep 25 13:48:57 2018
New Revision: 343025
URL: http://llvm.org/viewvc/llvm-project?rev=343025&view=rev
Log:
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.
Modified:
llvm/trunk/include/llvm/Support/MSVCErrorWorkarounds.h
llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
Modified: llvm/trunk/include/llvm/Support/MSVCErrorWorkarounds.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MSVCErrorWorkarounds.h?rev=343025&r1=343024&r2=343025&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/MSVCErrorWorkarounds.h (original)
+++ llvm/trunk/include/llvm/Support/MSVCErrorWorkarounds.h Tue Sep 25 13:48:57 2018
@@ -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
Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp?rev=343025&r1=343024&r2=343025&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp Tue Sep 25 13:48:57 2018
@@ -1087,7 +1087,7 @@ Error RuntimeDyldImpl::resolveExternalSy
#ifdef _MSC_VER
using ExpectedLookupResult =
- MSVCPExpected<JITSymbolResolver::LooupResult>;
+ MSVCPExpected<JITSymbolResolver::LookupResult>;
#else
using ExpectedLookupResult = Expected<JITSymbolResolver::LookupResult>;
#endif
Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp?rev=343025&r1=343024&r2=343025&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp Tue Sep 25 13:48:57 2018
@@ -735,7 +735,7 @@ Expected<JITSymbolResolver::LookupResult
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
More information about the llvm-commits
mailing list