diff options
7 files changed, 30 insertions, 14 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/changevector.hpp b/searchlib/src/vespa/searchlib/attribute/changevector.hpp index 43787bf8bd4..a81c14aa85c 100644 --- a/searchlib/src/vespa/searchlib/attribute/changevector.hpp +++ b/searchlib/src/vespa/searchlib/attribute/changevector.hpp @@ -5,6 +5,7 @@ #include "changevector.h" #include <vespa/vespalib/util/memoryusage.h> #include <vespa/vespalib/util/alloc.h> +#include <algorithm> namespace search { diff --git a/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp b/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp index f33b571f263..60d04d7e3ad 100644 --- a/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp +++ b/searchlib/src/vespa/searchlib/common/indexmetainfo.cpp @@ -5,6 +5,7 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/guard.h> #include <cassert> +#include <algorithm> #include <vespa/log/log.h> LOG_SETUP(".indexmetainfo"); diff --git a/slobrok/src/vespa/slobrok/server/service_map_history.cpp b/slobrok/src/vespa/slobrok/server/service_map_history.cpp index 3303f364515..7ddbce899d5 100644 --- a/slobrok/src/vespa/slobrok/server/service_map_history.cpp +++ b/slobrok/src/vespa/slobrok/server/service_map_history.cpp @@ -70,7 +70,7 @@ void ServiceMapHistory::asyncGenerationDiff(DiffCompletionHandler *handler, cons } bool ServiceMapHistory::cancel(DiffCompletionHandler *handler) { - size_t removed = std::erase_if(_waitList, [=](const Waiter &elem){ return elem.first == handler; }); + size_t removed = std::erase_if(_waitList, [=](const Waiter &elem) noexcept { return elem.first == handler; }); return (removed > 0); } diff --git a/slobrok/src/vespa/slobrok/server/union_service_map.cpp b/slobrok/src/vespa/slobrok/server/union_service_map.cpp index fc8b0cbcdfd..5a55299770a 100644 --- a/slobrok/src/vespa/slobrok/server/union_service_map.cpp +++ b/slobrok/src/vespa/slobrok/server/union_service_map.cpp @@ -83,7 +83,7 @@ void UnionServiceMap::remove(const ServiceMapping &mapping) return; } size_t old_size = values.size(); - std::erase_if(values, [] (const CountedSpec &v) { return v.count == 0; }); + std::erase_if(values, [] (const CountedSpec &v) noexcept { return v.count == 0; }); if (values.size() == 1u) { LOG_ASSERT(old_size == 2u); ServiceMapping toAdd{key, values[0].spec}; diff --git a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp index 4ea3eb2fff2..cc8d61cb7c2 100644 --- a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp +++ b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp @@ -43,11 +43,11 @@ Test::testNormalUsage() << XmlEndTag() << XmlEndTag(); std::string expected = - "\n<car>\n" + "<car>\n" "<door windowstate=\"up\"/>\n" "<description>This is a car description used to test</description>\n" "</car>"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } void @@ -76,14 +76,14 @@ Test::testEscaping() << XmlEndTag() << XmlEndTag(); std::string expected = - "\n<__trash_->\n" + "<__trash_->\n" "<foo bar=\"<100%" & >\"/>\n" "<escaped><>&\"'% \n	�</escaped>\n" "<encoded binaryencoding=\"base64\">PD4mIiclIAkMAA==</encoded>\n" "<auto1><>&	 \nfoo</auto1>\n" "<auto2 binaryencoding=\"base64\">PD4mCQANCmZvbw==</auto2>\n" "</__trash_->"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } namespace { @@ -118,7 +118,7 @@ Test::testNesting() << XmlEndTag() << XmlEndTag(); std::string expected = - "\n<car>\n" + "<car>\n" "<door color=\"blue\">\n" "<other count=\"5\">\n" "<something>foo</something>\n" @@ -127,7 +127,7 @@ Test::testNesting() "</door>\n" "<description>This is a car description used to test</description>\n" "</car>"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } void @@ -146,7 +146,7 @@ Test::testIndent() << XmlEndTag() << XmlEndTag() << XmlEndTag(); - std::string expected = "\n" + std::string expected = "<foo>\n" " <bar>2.14</bar>\n" " Litt innhold\n" @@ -155,7 +155,7 @@ Test::testIndent() " <base binaryencoding=\"base64\">Zm9vYmFy</base>\n" " </nytag>\n" "</foo>"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } } // vespalib diff --git a/vespamalloc/src/tests/doubledelete/doubledelete.cpp b/vespamalloc/src/tests/doubledelete/doubledelete.cpp index bd04be2da5d..fd3eadddd69 100644 --- a/vespamalloc/src/tests/doubledelete/doubledelete.cpp +++ b/vespamalloc/src/tests/doubledelete/doubledelete.cpp @@ -3,12 +3,19 @@ void *savedptr; +void delete_ptr_real(char *ptr) +{ + delete ptr; +} + +void (*delete_ptr)(char *ptr) = delete_ptr_real; + int main(int argc, char *argv[]) { (void) argc; (void) argv; char * a = new char; savedptr = a; - delete a; - delete a; + delete_ptr(a); + delete_ptr(a); } diff --git a/vespamalloc/src/tests/overwrite/overwrite.cpp b/vespamalloc/src/tests/overwrite/overwrite.cpp index 151207e95fa..aae5cccb696 100644 --- a/vespamalloc/src/tests/overwrite/overwrite.cpp +++ b/vespamalloc/src/tests/overwrite/overwrite.cpp @@ -17,6 +17,13 @@ void overwrite_memory_real(char *ptr, int offset) void (*overwrite_memory)(char *ptr, int offset) = overwrite_memory_real; +void delete_vec_real(char *ptr) +{ + delete [] ptr; +} + +void (*delete_vec)(char *ptr) = delete_vec_real; + class Test : public TestApp { public: @@ -43,7 +50,7 @@ void Test::testFillValue(char *a) char *d = new char[256]; memset(d, 0x77, 256); check_ptr(d); - delete [] d; + delete_vec(d); EXPECT_EQUAL((int)d[0], 0x66); EXPECT_EQUAL((int)d[1], 0x66); EXPECT_EQUAL((int)d[255], 0x66); @@ -84,7 +91,7 @@ void Test::verifyWriteAfterFreeDetection() // Make sure that enough blocks of memory is allocated and freed. char * a = new char[256]; check_ptr(a); - delete [] a; + delete_vec(a); for (size_t i(0); i < 100; i++) { char *d = new char[256]; check_ptr(d); |