commit f084384e0d00eb169928199bf1093e7f0a53358a
author Tim Murray <timmurray@google.com> Wed Oct 01 23:31:46 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 01 23:31:46 2014 +0000
tree 20e0b24d76d7b31699c7bbd6b8549f0b817f2d35
parent 8f5c2a1c1392a6d6bdb5700f73eeadd7b01ea0b7
parent c7d73a063bfd38639c6fe823b2b45e983df0e363

Merge "Remove Atom workaround." into lmp-dev

bcinfo/BitReader_2_7/BitcodeReader.cpp

diff --git a/bcinfo/BitReader_2_7/BitcodeReader.cpp b/bcinfo/BitReader_2_7/BitcodeReader.cpp
index d9f8d69..73cf200 100644
--- a/bcinfo/BitReader_2_7/BitcodeReader.cpp
+++ b/bcinfo/BitReader_2_7/BitcodeReader.cpp
@@ -3068,8 +3068,8 @@
 }
 
 namespace {
-class BitcodeErrorCategoryType : public std::__do_message {
-  const char *name() const override {
+class BitcodeErrorCategoryType : public std::error_category {
+  const char *name() const LLVM_NOEXCEPT override {
     return "llvm.bitcode";
   }
   std::string message(int IE) const override {

bcinfo/BitReader_3_0/BitcodeReader.cpp

diff --git a/bcinfo/BitReader_3_0/BitcodeReader.cpp b/bcinfo/BitReader_3_0/BitcodeReader.cpp
index 5eb5bbb..5e565ee 100644
--- a/bcinfo/BitReader_3_0/BitcodeReader.cpp
+++ b/bcinfo/BitReader_3_0/BitcodeReader.cpp
@@ -3403,8 +3403,8 @@
 }
 
 namespace {
-class BitcodeErrorCategoryType : public std::__do_message {
-  const char *name() const override {
+class BitcodeErrorCategoryType : public std::error_category {
+  const char *name() const LLVM_NOEXCEPT override {
     return "llvm.bitcode";
   }
   std::string message(int IE) const override {