commit 35866ed08bcefa9d8bffab9ca64cf994ad0f4290
author Yunlian Jiang <yunlian@google.com> Thu Jan 29 13:09:20 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Jan 30 02:58:15 2015 +0000
tree 2e389f1794b1c0497e3b2e5e8ac9224acafd5aee
parent 8ce80d68e65eba1142aed568997a2e758d2f9786

update_engine: fix -Winconsistent-missing-override warning

BUG=chromium:453566
TEST=FEATURES="test" emerge-amd64-generic update_engine

Change-Id: Icf889d01021993e6b3175b3a15efe82069d2d2fc
Reviewed-on: https://chromium-review.googlesource.com/244411
Reviewed-by: Alex Deymo <deymo@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>

update_manager/fake_variable.h

diff --git a/update_manager/fake_variable.h b/update_manager/fake_variable.h
index 5b9facc..9e51f7b 100644
--- a/update_manager/fake_variable.h
+++ b/update_manager/fake_variable.h
@@ -42,8 +42,8 @@
   // to the caller and the pointer is release from the FakeVariable. A second
   // call to GetValue() without reset() will return null and set the error
   // message.
-  virtual const T* GetValue(base::TimeDelta /* timeout */,
-                            std::string* errmsg) {
+  const T* GetValue(base::TimeDelta /* timeout */,
+                    std::string* errmsg) override {
     if (ptr_ == nullptr && errmsg != nullptr)
       *errmsg = this->GetName() + " is an empty FakeVariable";
     // Passes the pointer ownership to the caller.

update_manager/real_random_provider.cc

diff --git a/update_manager/real_random_provider.cc b/update_manager/real_random_provider.cc
index add26e5..2aa8d57 100644
--- a/update_manager/real_random_provider.cc
+++ b/update_manager/real_random_provider.cc
@@ -37,8 +37,8 @@
   ~RandomSeedVariable() override {}
 
  protected:
-  virtual const uint64_t* GetValue(base::TimeDelta /* timeout */,
-                                   string* errmsg) {
+  const uint64_t* GetValue(base::TimeDelta /* timeout */,
+                           string* errmsg) override {
     uint64_t result;
     // Aliasing via char pointer abides by the C/C++ strict-aliasing rules.
     char* const buf = reinterpret_cast<char*>(&result);

update_manager/variable_unittest.cc

diff --git a/update_manager/variable_unittest.cc b/update_manager/variable_unittest.cc
index 912d55c..642b5dd 100644
--- a/update_manager/variable_unittest.cc
+++ b/update_manager/variable_unittest.cc
@@ -28,8 +28,8 @@
   ~DefaultVariable() override {}
 
  protected:
-  virtual const T* GetValue(TimeDelta /* timeout */,
-                            string* /* errmsg */) {
+  const T* GetValue(TimeDelta /* timeout */,
+                    string* /* errmsg */) override {
     return new T();
   }