Replace llvm::error_code with std::error_code.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210783 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-06-12 14:11:22 +00:00
parent 7edfaf7148
commit 15aa07b2e8
5 changed files with 12 additions and 12 deletions

View File

@@ -103,7 +103,7 @@ public:
new (getErrorStorage()) error_code(make_error_code(ErrorCode)); new (getErrorStorage()) error_code(make_error_code(ErrorCode));
} }
ErrorOr(llvm::error_code EC) : HasError(true) { ErrorOr(std::error_code EC) : HasError(true) {
new (getErrorStorage()) error_code(EC); new (getErrorStorage()) error_code(EC);
} }

View File

@@ -880,7 +880,7 @@ public:
~Input(); ~Input();
// Check if there was an syntax or semantic error during parsing. // Check if there was an syntax or semantic error during parsing.
llvm::error_code error(); std::error_code error();
private: private:
bool outputting() override; bool outputting() override;
@@ -988,7 +988,7 @@ private:
llvm::SourceMgr SrcMgr; // must be before Strm llvm::SourceMgr SrcMgr; // must be before Strm
std::unique_ptr<llvm::yaml::Stream> Strm; std::unique_ptr<llvm::yaml::Stream> Strm;
std::unique_ptr<HNode> TopNode; std::unique_ptr<HNode> TopNode;
llvm::error_code EC; std::error_code EC;
llvm::BumpPtrAllocator StringAllocator; llvm::BumpPtrAllocator StringAllocator;
llvm::yaml::document_iterator DocIterator; llvm::yaml::document_iterator DocIterator;
std::vector<bool> BitValuesUsed; std::vector<bool> BitValuesUsed;

View File

@@ -865,7 +865,7 @@ bool home_directory(SmallVectorImpl<char> &result) {
} // end namespace path } // end namespace path
namespace windows { namespace windows {
llvm::error_code UTF8ToUTF16(llvm::StringRef utf8, std::error_code UTF8ToUTF16(llvm::StringRef utf8,
llvm::SmallVectorImpl<wchar_t> &utf16) { llvm::SmallVectorImpl<wchar_t> &utf16) {
if (!utf8.empty()) { if (!utf8.empty()) {
int len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, utf8.begin(), int len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, utf8.begin(),
@@ -888,10 +888,10 @@ llvm::error_code UTF8ToUTF16(llvm::StringRef utf8,
utf16.push_back(0); utf16.push_back(0);
utf16.pop_back(); utf16.pop_back();
return llvm::error_code(); return std::error_code();
} }
llvm::error_code UTF16ToUTF8(const wchar_t *utf16, size_t utf16_len, std::error_code UTF16ToUTF8(const wchar_t *utf16, size_t utf16_len,
llvm::SmallVectorImpl<char> &utf8) { llvm::SmallVectorImpl<char> &utf8) {
if (utf16_len) { if (utf16_len) {
// Get length. // Get length.
@@ -916,7 +916,7 @@ llvm::error_code UTF16ToUTF8(const wchar_t *utf16, size_t utf16_len,
utf8.push_back(0); utf8.push_back(0);
utf8.pop_back(); utf8.pop_back();
return llvm::error_code(); return std::error_code();
} }
} // end namespace windows } // end namespace windows
} // end namespace sys } // end namespace sys

View File

@@ -17,9 +17,9 @@
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h" #include "llvm/Support/system_error.h"
llvm::error_code coff2yaml(llvm::raw_ostream &Out, std::error_code coff2yaml(llvm::raw_ostream &Out,
const llvm::object::COFFObjectFile &Obj); const llvm::object::COFFObjectFile &Obj);
llvm::error_code elf2yaml(llvm::raw_ostream &Out, std::error_code elf2yaml(llvm::raw_ostream &Out,
const llvm::object::ObjectFile &Obj); const llvm::object::ObjectFile &Obj);
#endif #endif

View File

@@ -57,7 +57,7 @@ void insertCUDescriptor(Module *M, StringRef File, StringRef Dir,
bool removeIfExists(StringRef Path) { bool removeIfExists(StringRef Path) {
// This is an approximation, on error we don't know in general if the file // This is an approximation, on error we don't know in general if the file
// existed or not. // existed or not.
llvm::error_code EC = sys::fs::remove(Path, false); std::error_code EC = sys::fs::remove(Path, false);
return EC != std::errc::no_such_file_or_directory; return EC != std::errc::no_such_file_or_directory;
} }