Don't import error_condition into the llvm namespace.

[oota-llvm.git] / lib / ProfileData / InstrProf.cpp

diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp
index eed517df0527d6102883f54be7bd89cb1bbe9eb9..88ae7582ccbdaf986e61bf28632ee7c18ae1eff3 100644 (file)
--- 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;
   }
 };