Sink DwarfUnit::applySubprogramAttributesToDefinition into DwarfCompileUnit

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

diff --git a/tools/obj2yaml/Error.h b/tools/obj2yaml/Error.h
index 7180d543075e96fba8c5f966436322148e6d67ad..982f59e236cc024b9cdbee177c421d0875b79e0b 100644 (file)
--- a/tools/obj2yaml/Error.h
+++ b/tools/obj2yaml/Error.h
@@ -7,14 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_ERROR_H
-#define LLVM_TOOLS_ERROR_H
+#ifndef LLVM_TOOLS_OBJ2YAML_ERROR_H
+#define LLVM_TOOLS_OBJ2YAML_ERROR_H
 
-#include "llvm/Support/system_error.h"
+#include <system_error>
 
 namespace llvm {
-
-const error_category &obj2yaml_category();
+const std::error_category &obj2yaml_category();
 
 enum class obj2yaml_error {
   success = 0,
@@ -23,8 +22,8 @@ enum class obj2yaml_error {
   unsupported_obj_file_format
 };
 
-inline error_code make_error_code(obj2yaml_error e) {
-  return error_code(static_cast<int>(e), obj2yaml_category());
+inline std::error_code make_error_code(obj2yaml_error e) {
+  return std::error_code(static_cast<int>(e), obj2yaml_category());
 }
 
 } // namespace llvm