[llvm] r291786 - Avoid std::errc::protocol_* to appease mingw
Hans Wennborg via llvm-commits
llvm-commits at lists.llvm.org
Thu Jan 12 10:45:32 PST 2017
dberris, takumi: fyi.
On Thu, Jan 12, 2017 at 10:33 AM, Hans Wennborg via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: hans
> Date: Thu Jan 12 12:33:14 2017
> New Revision: 291786
>
> URL: http://llvm.org/viewvc/llvm-project?rev=291786&view=rev
> Log:
> Avoid std::errc::protocol_* to appease mingw
>
> Like r291636 and r285261.
>
> Modified:
> llvm/trunk/lib/XRay/Trace.cpp
> llvm/trunk/tools/llvm-xray/xray-account.cc
> llvm/trunk/tools/llvm-xray/xray-converter.cc
>
> Modified: llvm/trunk/lib/XRay/Trace.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/XRay/Trace.cpp?rev=291786&r1=291785&r2=291786&view=diff
> ==============================================================================
> --- llvm/trunk/lib/XRay/Trace.cpp (original)
> +++ llvm/trunk/lib/XRay/Trace.cpp Thu Jan 12 12:33:14 2017
> @@ -144,7 +144,7 @@ Expected<Trace> llvm::xray::loadTraceFil
> if (FileSize < 4) {
> return make_error<StringError>(
> Twine("File '") + Filename + "' too small for XRay.",
> - std::make_error_code(std::errc::protocol_error));
> + std::make_error_code(std::errc::executable_format_error));
> }
>
> // Attempt to mmap the file.
>
> Modified: llvm/trunk/tools/llvm-xray/xray-account.cc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-account.cc?rev=291786&r1=291785&r2=291786&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-xray/xray-account.cc (original)
> +++ llvm/trunk/tools/llvm-xray/xray-account.cc Thu Jan 12 12:33:14 2017
> @@ -477,7 +477,7 @@ static CommandRegistration Unused(&Accou
> return joinErrors(
> make_error<StringError>(
> Twine("Failed loading input file '") + AccountInput + "'",
> - std::make_error_code(std::errc::protocol_error)),
> + std::make_error_code(std::errc::executable_format_error)),
> TraceOrErr.takeError());
> }
>
>
> Modified: llvm/trunk/tools/llvm-xray/xray-converter.cc
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-converter.cc?rev=291786&r1=291785&r2=291786&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-xray/xray-converter.cc (original)
> +++ llvm/trunk/tools/llvm-xray/xray-converter.cc Thu Jan 12 12:33:14 2017
> @@ -192,7 +192,7 @@ static CommandRegistration Unused(&Conve
> return joinErrors(
> make_error<StringError>(
> Twine("Failed loading input file '") + ConvertInput + "'.",
> - std::make_error_code(std::errc::protocol_error)),
> + std::make_error_code(std::errc::executable_format_error)),
> TraceOrErr.takeError());
> }
> return Error::success();
More information about the llvm-commits
mailing list