From bd8e9542163f4218b6ad52df8c143c06263ff4a2 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Fri, 27 May 2016 01:54:25 +0000 Subject: [Support] Rename unconvertibleErrorCode to inconvertibleErrorCode. Based on a totally scientific, 30 second google search "in-" appears to be the preferred prefix. llvm-svn: 270950 --- llvm/lib/Support/Error.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/lib/Support/Error.cpp') diff --git a/llvm/lib/Support/Error.cpp b/llvm/lib/Support/Error.cpp index 6a8189596da..f2985de0a4e 100644 --- a/llvm/lib/Support/Error.cpp +++ b/llvm/lib/Support/Error.cpp @@ -20,7 +20,7 @@ namespace { enum class ErrorErrorCode : int { MultipleErrors = 1, - UnconvertibleError + InconvertibleError }; // FIXME: This class is only here to support the transition to llvm::Error. It @@ -34,8 +34,8 @@ namespace { switch (static_cast(condition)) { case ErrorErrorCode::MultipleErrors: return "Multiple errors"; - case ErrorErrorCode::UnconvertibleError: - return "Unconvertible error value. An error has occurred that could " + case ErrorErrorCode::InconvertibleError: + return "Inconvertible error value. An error has occurred that could " "not be converted to a known std::error_code. Please file a " "bug."; } @@ -61,8 +61,8 @@ std::error_code ErrorList::convertToErrorCode() const { *ErrorErrorCat); } -std::error_code unconvertibleErrorCode() { - return std::error_code(static_cast(ErrorErrorCode::UnconvertibleError), +std::error_code inconvertibleErrorCode() { + return std::error_code(static_cast(ErrorErrorCode::InconvertibleError), *ErrorErrorCat); } @@ -77,7 +77,7 @@ std::error_code errorToErrorCode(Error Err) { handleAllErrors(std::move(Err), [&](const ErrorInfoBase &EI) { EC = EI.convertToErrorCode(); }); - if (EC == unconvertibleErrorCode()) + if (EC == inconvertibleErrorCode()) report_fatal_error(EC.message()); return EC; } -- cgit v1.2.3