summaryrefslogtreecommitdiff
path: root/lib/ProfileData
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-06-12 01:29:42 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-06-12 01:29:42 +0000
commit173d7ff83300ece5cc18049cf5c909c1e8d179d9 (patch)
treefb50c261a9b8c1ee2f480fe5acf4b68e10f817fc /lib/ProfileData
parent5ac7ab395a4a2954d2c5aefa75f2affc859641cc (diff)
downloadllvm-173d7ff83300ece5cc18049cf5c909c1e8d179d9.tar.gz
llvm-173d7ff83300ece5cc18049cf5c909c1e8d179d9.tar.bz2
llvm-173d7ff83300ece5cc18049cf5c909c1e8d179d9.tar.xz
Don't import error_condition into the llvm namespace.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210731 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ProfileData')
-rw-r--r--lib/ProfileData/InstrProf.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp
index eed517df05..88ae7582cc 100644
--- a/lib/ProfileData/InstrProf.cpp
+++ b/lib/ProfileData/InstrProf.cpp
@@ -52,9 +52,10 @@ class InstrProfErrorCategoryType : public error_category {
}
llvm_unreachable("A value of instrprof_error has no message.");
}
- error_condition default_error_condition(int EV) const LLVM_NOEXCEPT override {
+ std::error_condition
+ default_error_condition(int EV) const LLVM_NOEXCEPT override {
if (static_cast<instrprof_error>(EV) == instrprof_error::success)
- return error_condition();
+ return std::error_condition();
return std::errc::invalid_argument;
}
};