diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 01:45:43 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 01:45:43 +0000 |
commit | 9ee34311f3a9f6d49023bc74f6028133f90e1d4f (patch) | |
tree | 6b3d06f5e87630dedb0061106b53f58c8b2b5c12 /lib | |
parent | 173d7ff83300ece5cc18049cf5c909c1e8d179d9 (diff) | |
download | llvm-9ee34311f3a9f6d49023bc74f6028133f90e1d4f.tar.gz llvm-9ee34311f3a9f6d49023bc74f6028133f90e1d4f.tar.bz2 llvm-9ee34311f3a9f6d49023bc74f6028133f90e1d4f.tar.xz |
Don't import error_category into the llvm namespace.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210733 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 4 | ||||
-rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.h | 2 | ||||
-rw-r--r-- | lib/Object/Error.cpp | 4 | ||||
-rw-r--r-- | lib/ProfileData/InstrProf.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 849c548e0b..a5eec0f70d 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -3300,7 +3300,7 @@ error_code BitcodeReader::InitLazyStream() { } namespace { -class BitcodeErrorCategoryType : public error_category { +class BitcodeErrorCategoryType : public std::error_category { const char *name() const LLVM_NOEXCEPT override { return "llvm.bitcode"; } @@ -3351,7 +3351,7 @@ class BitcodeErrorCategoryType : public error_category { }; } -const error_category &BitcodeReader::BitcodeErrorCategory() { +const std::error_category &BitcodeReader::BitcodeErrorCategory() { static BitcodeErrorCategoryType O; return O; } diff --git a/lib/Bitcode/Reader/BitcodeReader.h b/lib/Bitcode/Reader/BitcodeReader.h index 593d8f93cc..65821caf85 100644 --- a/lib/Bitcode/Reader/BitcodeReader.h +++ b/lib/Bitcode/Reader/BitcodeReader.h @@ -193,7 +193,7 @@ class BitcodeReader : public GVMaterializer { /// not need this flag. bool UseRelativeIDs; - static const error_category &BitcodeErrorCategory(); + static const std::error_category &BitcodeErrorCategory(); public: enum ErrorType { diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp index 39d765f884..0a29cac6c4 100644 --- a/lib/Object/Error.cpp +++ b/lib/Object/Error.cpp @@ -18,7 +18,7 @@ using namespace llvm; using namespace object; namespace { -class _object_error_category : public error_category { +class _object_error_category : public std::error_category { public: const char* name() const LLVM_NOEXCEPT override; std::string message(int ev) const override; @@ -55,7 +55,7 @@ _object_error_category::default_error_condition(int EV) const { return std::errc::invalid_argument; } -const error_category &object::object_category() { +const std::error_category &object::object_category() { static _object_error_category o; return o; } diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp index 88ae7582cc..628edfb86c 100644 --- a/lib/ProfileData/InstrProf.cpp +++ b/lib/ProfileData/InstrProf.cpp @@ -18,7 +18,7 @@ using namespace llvm; namespace { -class InstrProfErrorCategoryType : public error_category { +class InstrProfErrorCategoryType : public std::error_category { const char *name() const LLVM_NOEXCEPT override { return "llvm.instrprof"; } std::string message(int IE) const override { instrprof_error E = static_cast<instrprof_error>(IE); @@ -61,7 +61,7 @@ class InstrProfErrorCategoryType : public error_category { }; } -const error_category &llvm::instrprof_category() { +const std::error_category &llvm::instrprof_category() { static InstrProfErrorCategoryType C; return C; } |