[llvm] r291636 - tools/llvm-xray: Avoid std::errc::protocol_* to appease mingw, like r285261.

[NAKAMURA Takumi via llvm-commits]

Author: chapuni
Date: Tue Jan 10 19:06:57 2017
New Revision: 291636

URL: http://llvm.org/viewvc/llvm-project?rev=291636&view=rev
Log:
tools/llvm-xray: Avoid std::errc::protocol_* to appease mingw, like r285261.

They are oriented from winsock and mingw doesn't import them.

Modified:
    llvm/trunk/tools/llvm-xray/xray-converter.cc
    llvm/trunk/tools/llvm-xray/xray-extract.cc
    llvm/trunk/tools/llvm-xray/xray-log-reader.cc

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=291636&r1=291635&r2=291636&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-xray/xray-converter.cc (original)
+++ llvm/trunk/tools/llvm-xray/xray-converter.cc Tue Jan 10 19:06:57 2017
@@ -195,7 +195,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)),
         std::move(Err));
 
   raw_fd_ostream OS(ConvertOutput, EC,

Modified: llvm/trunk/tools/llvm-xray/xray-extract.cc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-extract.cc?rev=291636&r1=291635&r2=291636&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-xray/xray-extract.cc (original)
+++ llvm/trunk/tools/llvm-xray/xray-extract.cc Tue Jan 10 19:06:57 2017
@@ -254,7 +254,7 @@ InstrumentationMapExtractor::Instrumenta
               make_error<StringError>(
                   Twine("Cannot load YAML instrumentation map from '") +
                       Filename + "'.",
-                  std::make_error_code(std::errc::wrong_protocol_type)),
+                  std::make_error_code(std::errc::executable_format_error)),
               std::move(E));
         });
     break;

Modified: llvm/trunk/tools/llvm-xray/xray-log-reader.cc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-xray/xray-log-reader.cc?rev=291636&r1=291635&r2=291636&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-xray/xray-log-reader.cc (original)
+++ llvm/trunk/tools/llvm-xray/xray-log-reader.cc Tue Jan 10 19:06:57 2017
@@ -123,7 +123,7 @@ Error llvm::xray::NaiveLogLoader(StringR
     default:
       return make_error<StringError>(
           Twine("Unknown record type '") + Twine(int{Type}) + "'",
-          std::make_error_code(std::errc::protocol_error));
+          std::make_error_code(std::errc::executable_format_error));
     }
     Record.FuncId = RecordExtractor.getSigned(&OffsetPtr, sizeof(int32_t));
     Record.TSC = RecordExtractor.getU64(&OffsetPtr);