Fixup readabilty/inheritance warnings (#1805)

This CL removes the un-needed virtual qualifiers from methods already
marked as override.

6 files changed, 6 insertions, 7 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index e59fdfb1..dd3117f2 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -22,7 +22,6 @@ LINT_FILTERS = [
   "-build/storage_class",
   "-readability/casting",
   "-readability/fn_size",
-  "-readability/inheritance",
   "-readability/todo",
   "-runtime/explicit",
   "-runtime/int",
diff --git a/test/link/global_values_amount_test.cpp b/test/link/global_values_amount_test.cpp
index 9901d21d..2c4ee1f0 100644
--- a/test/link/global_values_amount_test.cpp
+++ b/test/link/global_values_amount_test.cpp
@@ -26,7 +26,7 @@ class EntryPointsAmountTest : public spvtest::LinkerTest {
  public:
   EntryPointsAmountTest() { binaries.reserve(0xFFFF); }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     binaries.push_back({SpvMagicNumber,
                         SpvVersion,
                         SPV_GENERATOR_CODEPLAY,
@@ -103,7 +103,7 @@ class EntryPointsAmountTest : public spvtest::LinkerTest {
       binaries.push_back(binary);
     }
   }
-  virtual void TearDown() override { binaries.clear(); }
+  void TearDown() override { binaries.clear(); }
 
   spvtest::Binaries binaries;
 };
diff --git a/test/link/linker_fixture.h b/test/link/linker_fixture.h
index a9436840..303f1bfd 100644
--- a/test/link/linker_fixture.h
+++ b/test/link/linker_fixture.h
@@ -61,7 +61,7 @@ class LinkerTest : public ::testing::Test {
     tools_.SetMessageConsumer(consumer);
   }
 
-  virtual void TearDown() override { error_message_.clear(); }
+  void TearDown() override { error_message_.clear(); }
 
   // Assembles each of the given strings into SPIR-V binaries before linking
   // them together. SPV_ERROR_INVALID_TEXT is returned if the assembling failed
diff --git a/test/opt/decoration_manager_test.cpp b/test/opt/decoration_manager_test.cpp
index ea6aec52..973cb403 100644
--- a/test/opt/decoration_manager_test.cpp
+++ b/test/opt/decoration_manager_test.cpp
@@ -63,7 +63,7 @@ class DecorationManagerTest : public ::testing::Test {
     tools_.SetMessageConsumer(consumer_);
   }
 
-  virtual void TearDown() override { error_message_.clear(); }
+  void TearDown() override { error_message_.clear(); }
 
   DecorationManager* GetDecorationManager(const std::string& text) {
     context_ = BuildModule(SPV_ENV_UNIVERSAL_1_2, consumer_, text);
diff --git a/test/opt/pass_remove_duplicates_test.cpp b/test/opt/pass_remove_duplicates_test.cpp
index 16fcd4b8..887fdfdb 100644
--- a/test/opt/pass_remove_duplicates_test.cpp
+++ b/test/opt/pass_remove_duplicates_test.cpp
@@ -61,7 +61,7 @@ class RemoveDuplicatesTest : public ::testing::Test {
     tools_.SetMessageConsumer(consumer_);
   }
 
-  virtual void TearDown() override { error_message_.clear(); }
+  void TearDown() override { error_message_.clear(); }
 
   std::string RunPass(const std::string& text) {
     context_ = spvtools::BuildModule(SPV_ENV_UNIVERSAL_1_2, consumer_, text);
diff --git a/test/opt/types_test.cpp b/test/opt/types_test.cpp
index 69a1d96b..b2691dee 100644
--- a/test/opt/types_test.cpp
+++ b/test/opt/types_test.cpp
@@ -28,7 +28,7 @@ namespace {
 // Fixture class providing some element types.
 class SameTypeTest : public ::testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     void_t_.reset(new Void());
     u32_t_.reset(new Integer(32, false));
     f64_t_.reset(new Float(64));