There is no std::errc::success, remove the llvm one.
llvm-svn: 209960
diff --git a/llvm/include/llvm/Support/system_error.h b/llvm/include/llvm/Support/system_error.h
index 9854a9e..9d300fb 100644
--- a/llvm/include/llvm/Support/system_error.h
+++ b/llvm/include/llvm/Support/system_error.h
@@ -483,7 +483,6 @@
// for them:
enum class errc {
- success = 0,
address_family_not_supported = EAFNOSUPPORT,
address_in_use = EADDRINUSE,
address_not_available = EADDRNOTAVAIL,
@@ -810,7 +809,6 @@
//
// error_code( ::GetLastError(), system_category() )
enum class windows_error {
- success = 0,
// These names and values are based on Windows WinError.h
// This is not a complete list. Add to this list if you need to explicitly
// check for it.
diff --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp
index 8e50869..6f72849 100644
--- a/llvm/lib/Object/Error.cpp
+++ b/llvm/lib/Object/Error.cpp
@@ -49,7 +49,7 @@
error_condition _object_error_category::default_error_condition(int ev) const {
if (ev == object_error::success)
- return errc::success;
+ return error_condition();
return errc::invalid_argument;
}
diff --git a/llvm/lib/ProfileData/InstrProf.cpp b/llvm/lib/ProfileData/InstrProf.cpp
index de2b13d..60a8efb 100644
--- a/llvm/lib/ProfileData/InstrProf.cpp
+++ b/llvm/lib/ProfileData/InstrProf.cpp
@@ -54,7 +54,7 @@
}
error_condition default_error_condition(int EV) const override {
if (EV == instrprof_error::success)
- return errc::success;
+ return error_condition();
return errc::invalid_argument;
}
};
diff --git a/llvm/lib/Support/LockFileManager.cpp b/llvm/lib/Support/LockFileManager.cpp
index 9b4bfbe..05e75cf 100644
--- a/llvm/lib/Support/LockFileManager.cpp
+++ b/llvm/lib/Support/LockFileManager.cpp
@@ -124,7 +124,7 @@
// Create a link from the lock file name. If this succeeds, we're done.
error_code EC =
sys::fs::create_link(UniqueLockFileName.str(), LockFileName.str());
- if (EC == errc::success)
+ if (!EC)
return;
if (EC != errc::file_exists) {
diff --git a/llvm/lib/Support/Unix/Program.inc b/llvm/lib/Support/Unix/Program.inc
index 1225a9c..f4c6cdf 100644
--- a/llvm/lib/Support/Unix/Program.inc
+++ b/llvm/lib/Support/Unix/Program.inc
@@ -427,12 +427,12 @@
error_code sys::ChangeStdinToBinary(){
// Do nothing, as Unix doesn't differentiate between text and binary.
- return make_error_code(errc::success);
+ return error_code();
}
error_code sys::ChangeStdoutToBinary(){
// Do nothing, as Unix doesn't differentiate between text and binary.
- return make_error_code(errc::success);
+ return error_code();
}
bool llvm::sys::argumentsFitWithinSystemLimits(ArrayRef<const char*> Args) {
diff --git a/llvm/tools/llvm-readobj/Error.cpp b/llvm/tools/llvm-readobj/Error.cpp
index 83ed6a7..75c392e 100644
--- a/llvm/tools/llvm-readobj/Error.cpp
+++ b/llvm/tools/llvm-readobj/Error.cpp
@@ -50,7 +50,7 @@
error_condition _readobj_error_category::default_error_condition(int ev) const {
if (ev == readobj_error::success)
- return errc::success;
+ return error_condition();
return errc::invalid_argument;
}
diff --git a/llvm/tools/obj2yaml/Error.cpp b/llvm/tools/obj2yaml/Error.cpp
index 7be468d..0003b7b 100644
--- a/llvm/tools/obj2yaml/Error.cpp
+++ b/llvm/tools/obj2yaml/Error.cpp
@@ -42,7 +42,7 @@
error_condition
_obj2yaml_error_category::default_error_condition(int ev) const {
if (ev == obj2yaml_error::success)
- return errc::success;
+ return error_condition();
return errc::invalid_argument;
}