diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-25 12:36:14 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-25 12:43:07 +0100 |
commit | ae5bc11f30f156eb996b33f426f894384357309a (patch) | |
tree | 56f07ee0b83fa061abef507a7e39da2c2e63d16c /searchlib | |
parent | d3c80d67c20b23b3cff0ed49f0f6fa57bce703df (diff) |
Eliminate some gcc 9 warnings.
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/fef/number_or_object.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp index 9e75a85d289..84d925e0780 100644 --- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp +++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp @@ -1040,7 +1040,7 @@ TEST("require that findIncompleteCompactedFiles does expected filtering") { EXPECT_TRUE(toRemove.find(FileChunk::NameId(201)) != toRemove.end()); EXPECT_TRUE(toRemove.find(FileChunk::NameId(205)) != toRemove.end()); - EXPECT_EXCEPTION(LogDataStore::findIncompleteCompactedFiles(create({1,3,100,200,201,202,204})).empty(), + EXPECT_EXCEPTION((void) LogDataStore::findIncompleteCompactedFiles(create({1,3,100,200,201,202,204})).empty(), vespalib::IllegalStateException, "3 consecutive files {200, 201, 202}. Impossible"); } diff --git a/searchlib/src/vespa/searchlib/fef/number_or_object.h b/searchlib/src/vespa/searchlib/fef/number_or_object.h index 259a1622516..f9fb3d061b4 100644 --- a/searchlib/src/vespa/searchlib/fef/number_or_object.h +++ b/searchlib/src/vespa/searchlib/fef/number_or_object.h @@ -16,7 +16,8 @@ namespace search::fef { union NumberOrObject { feature_t as_number; vespalib::eval::Value::CREF as_object; - NumberOrObject() { memset(this, 0, sizeof(NumberOrObject)); } + char as_bytes[std::max(sizeof(as_number), sizeof(as_object))]; + NumberOrObject() { memset(as_bytes, 0, sizeof(as_bytes)); } ~NumberOrObject() {} }; |