diff options
| author | Stephen Hines <srhines@google.com> | 2014-04-25 20:47:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-25 20:47:46 +0000 |
| commit | 37a6adeb1525309c655d8acb341019d475b2a6a5 (patch) | |
| tree | e6cfb69fbbd937f450eeb83bfb83b9da3b01275a /lib/Object/Error.cpp | |
| parent | 69a8640022b04415ae9fac62f8ab090601d8f889 (diff) | |
| parent | 36b56886974eae4f9c5ebc96befd3e7bfe5de338 (diff) | |
| download | external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.zip external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.tar.gz external_llvm-37a6adeb1525309c655d8acb341019d475b2a6a5.tar.bz2 | |
Merge "Update to LLVM 3.5a."
Diffstat (limited to 'lib/Object/Error.cpp')
| -rw-r--r-- | lib/Object/Error.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp index 47ce38c..8e50869 100644 --- a/lib/Object/Error.cpp +++ b/lib/Object/Error.cpp @@ -18,11 +18,11 @@ using namespace llvm; using namespace object; namespace { -class _object_error_category : public _do_message { +class _object_error_category : public error_category { public: - virtual const char* name() const; - virtual std::string message(int ev) const; - virtual error_condition default_error_condition(int ev) const; + const char* name() const override; + std::string message(int ev) const override; + error_condition default_error_condition(int ev) const override; }; } |