commit acc5d7c9119db84f8a764f0536585e434acd83b8
author Rafael Espindola <rafael.espindola@gmail.com> Thu Jun 12 01:29:42 2014 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Jun 12 01:29:42 2014 +0000
tree 33f4716978e50fbfc077cd3a83ecc2e7762f0a9f
parent 7cc0d413b54949fe9f05cbcea11cd20c9ea44994

Don't import error_condition into the llvm namespace.

llvm-svn: 210731

llvm/lib/ProfileData/InstrProf.cpp

diff --git a/llvm/lib/ProfileData/InstrProf.cpp b/llvm/lib/ProfileData/InstrProf.cpp
index eed517d..88ae758 100644
--- a/llvm/lib/ProfileData/InstrProf.cpp
+++ b/llvm/lib/ProfileData/InstrProf.cpp
@@ -52,9 +52,10 @@
     }
     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;
   }
 };