projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factor out the checking of string tables.
[oota-llvm.git]
/
include
/
llvm
/
Object
/
Error.h
diff --git
a/include/llvm/Object/Error.h
b/include/llvm/Object/Error.h
index fbaf71c17b8efef4f5cd7f87c758083c944e7d23..1b0b56787c5cd34342492903b6c7c28dddd2eb70 100644
(file)
--- a/
include/llvm/Object/Error.h
+++ b/
include/llvm/Object/Error.h
@@
-14,37
+14,37
@@
#ifndef LLVM_OBJECT_ERROR_H
#define LLVM_OBJECT_ERROR_H
#ifndef LLVM_OBJECT_ERROR_H
#define LLVM_OBJECT_ERROR_H
-#include
"llvm/Support/system_error.h"
+#include
<system_error>
namespace llvm {
namespace object {
namespace llvm {
namespace object {
-const error_category &object_category();
+const
std::
error_category &object_category();
-
struct
object_error {
-enum _ {
-
success = 0
,
+
enum class
object_error {
+ // Error code 0 is absent. Use std::error_code() instead.
+
arch_not_found = 1
,
invalid_file_type,
parse_failed,
invalid_file_type,
parse_failed,
- unexpected_eof
+ unexpected_eof,
+ string_table_non_null_end,
+ bitcode_section_not_found,
+ macho_small_load_command,
+ macho_load_segment_too_many_sections,
+ macho_load_segment_too_small,
};
};
- _ v_;
- object_error(_ v) : v_(v) {}
- explicit object_error(int v) : v_(_(v)) {}
- operator int() const {return v_;}
-};
-
-inline error_code make_error_code(object_error e) {
- return error_code(static_cast<int>(e), object_category());
+inline std::error_code make_error_code(object_error e) {
+ return std::error_code(static_cast<int>(e), object_category());
}
} // end namespace object.
}
} // end namespace object.
-template <> struct is_error_code_enum<object::object_error> : true_type { };
-
-template <> struct is_error_code_enum<object::object_error::_> : true_type { };
-
} // end namespace llvm.
} // end namespace llvm.
+namespace std {
+template <>
+struct is_error_code_enum<llvm::object::object_error> : std::true_type {};
+}
+
#endif
#endif