GC som compiler pragmas not needed anymore.

3 files changed, 1 insertions, 26 deletions

diff --git a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
index 2993bae90c4..44decb9bf91 100644
--- a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
+++ b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
@@ -505,12 +505,6 @@ using TestTypes = testing::Types<DirectKeyValueParams, IndirectKeyValueParams>;
 
 TYPED_TEST_SUITE(BTreeStressTest, TestTypes);
 
-// Disable warnings emitted by gtest generated files when using typed tests
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
-
 TYPED_TEST(BTreeStressTest, basic_lower_bound)
 {
     this->basic_lower_bound();
@@ -531,8 +525,6 @@ TYPED_TEST(BTreeStressTest, multiple_lower_bound_readers_during_updates)
     this->multiple_lower_bound_readers_during_updates();
 }
 
-#pragma GCC diagnostic pop
-
 int main(int argc, char **argv) {
     if (argc > 1 && argv[1] == smoke_test_option) {
         smoke_test = true;
diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
index bc1aac3a8cd..176792962a6 100644
--- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
@@ -290,12 +290,6 @@ struct HashSmallOffsetNumberUniqueStore
 using UniqueStoreTestTypes = ::testing::Types<BTreeNumberUniqueStore, BTreeStringUniqueStore, BTreeCStringUniqueStore, BTreeDoubleUniqueStore, HybridNumberUniqueStore, HybridStringUniqueStore, HybridCStringUniqueStore, HybridDoubleUniqueStore, HashNumberUniqueStore, HashStringUniqueStore, HashCStringUniqueStore, HashDoubleUniqueStore>;
 TYPED_TEST_SUITE(TestBase, UniqueStoreTestTypes);
 
-// Disable warnings emitted by gtest generated files when using typed tests
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
-
 using NumberTest = TestBase<BTreeNumberUniqueStore>;
 using StringTest = TestBase<BTreeStringUniqueStore>;
 using CStringTest = TestBase<BTreeCStringUniqueStore>;
@@ -442,8 +436,6 @@ TYPED_TEST(TestBase, provided_memory_allocator_is_used)
     }
 }
 
-#pragma GCC diagnostic pop
-
 TEST_F(DoubleTest, nan_is_handled)
 {
     std::vector<double> myvalues = {
diff --git a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
index 61853079af6..420d2cfa8c3 100644
--- a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
@@ -4,7 +4,6 @@
 #include <vespa/vespalib/datastore/unique_store.hpp>
 #include <vespa/vespalib/datastore/unique_store_dictionary.hpp>
 #include <vespa/vespalib/datastore/sharded_hash_map.h>
-#include <vespa/vespalib/util/memoryusage.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
 #include <vespa/log/log.h>
@@ -25,7 +24,7 @@ private:
     }
 
 public:
-    Comparator(uint32_t to_find)
+    explicit Comparator(uint32_t to_find)
         : _to_find(to_find)
     {}
     bool less(const EntryRef lhs, const EntryRef rhs) const override {
@@ -77,12 +76,6 @@ struct UniqueStoreDictionaryTest : public ::testing::Test {
 using UniqueStoreDictionaryTestTypes = ::testing::Types<DefaultUniqueStoreDictionary, UniqueStoreDictionary<DefaultDictionary, IUniqueStoreDictionary, ShardedHashMap>, UniqueStoreDictionary<NoBTreeDictionary, IUniqueStoreDictionary, ShardedHashMap>>;
 TYPED_TEST_SUITE(UniqueStoreDictionaryTest, UniqueStoreDictionaryTestTypes);
 
-// Disable warnings emitted by gtest generated files when using typed tests
-#pragma GCC diagnostic push
-#ifndef __clang__
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
-
 TYPED_TEST(UniqueStoreDictionaryTest, can_count_occurrences_of_a_key)
 {
     this->add(3).add(5).take_snapshot();
@@ -165,6 +158,4 @@ TYPED_TEST(UniqueStoreDictionaryTest, compaction_works)
     EXPECT_EQ(exp_refs, refs);
 }
 
-#pragma GCC diagnostic pop
-
 GTEST_MAIN_RUN_ALL_TESTS()