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 | 25188c95de6bd74e15dad873ff5fc7e7c1330191 (patch) | |
tree | 325de84cba8ce381a3be7853e913180b056800fd /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
parent | 92d8b456d92927b1a86110dce0a3567062eab801 (diff) | |
download | bcm5719-llvm-25188c95de6bd74e15dad873ff5fc7e7c1330191.tar.gz bcm5719-llvm-25188c95de6bd74e15dad873ff5fc7e7c1330191.zip |
Don't import error_category into the llvm namespace.
llvm-svn: 210733
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
-rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 849c548e0bc..a5eec0f70d4 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/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; } |