[PowerPC] Fix the int2fp(fp2int(x)) DAGCombine to ignore ppc_fp128

[oota-llvm.git] / tools / llvm-readobj / Error.h

diff --git a/tools/llvm-readobj/Error.h b/tools/llvm-readobj/Error.h
index b9b7e526b9e84a4e7b60715d121a3e5b4c5ed515..f3e24bbe5dbfd79890fc66806b532e3a7f4cb735 100644 (file)
--- a/tools/llvm-readobj/Error.h
+++ b/tools/llvm-readobj/Error.h
@@ -11,13 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_READOBJ_ERROR_H
-#define LLVM_READOBJ_ERROR_H
+#ifndef LLVM_TOOLS_LLVM_READOBJ_ERROR_H
+#define LLVM_TOOLS_LLVM_READOBJ_ERROR_H
 
 #include <system_error>
 
 namespace llvm {
-using std::error_code;
 const std::error_category &readobj_category();
 
 enum class readobj_error {
@@ -29,8 +28,8 @@ enum class readobj_error {
   unknown_symbol
 };
 
-inline error_code make_error_code(readobj_error e) {
-  return error_code(static_cast<int>(e), readobj_category());
+inline std::error_code make_error_code(readobj_error e) {
+  return std::error_code(static_cast<int>(e), readobj_category());
 }
 
 } // namespace llvm