From b442e2371eff5e2c65e79ad73bce701c87f43456 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 10 Jun 2022 10:39:39 +0200 Subject: [PATCH 1/2] Do not use deprecated constructor for Reader. We have a specific private non deprecated constructor especially for that, let's use it. --- src/library.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/library.cpp b/src/library.cpp index 9c03afe2d..27be902ed 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -282,7 +282,7 @@ std::shared_ptr Library::getReaderById(const std::string& id) { auto archive = getArchiveById(id); if(archive) { - return std::make_shared(archive); + return std::shared_ptr(new Reader(archive, true)); } else { return nullptr; } From ae47e5ee4e6b8b710d909b479a8b490bd1e304ac Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 10 Jun 2022 11:21:35 +0200 Subject: [PATCH 2/2] uint is not defined on Windows --- test/lrucache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lrucache.cpp b/test/lrucache.cpp index ef3aa8789..7245b15c5 100644 --- a/test/lrucache.cpp +++ b/test/lrucache.cpp @@ -81,15 +81,15 @@ TEST(CacheTest, DropValue) { TEST(CacheTest1, KeepsAllValuesWithinCapacity) { kiwix::lru_cache cache_lru(TEST2_CACHE_CAPACITY); - for (uint i = 0; i < NUM_OF_TEST2_RECORDS; ++i) { + for (unsigned int i = 0; i < NUM_OF_TEST2_RECORDS; ++i) { cache_lru.put(i, i); } - for (uint i = 0; i < NUM_OF_TEST2_RECORDS - TEST2_CACHE_CAPACITY; ++i) { + for (unsigned int i = 0; i < NUM_OF_TEST2_RECORDS - TEST2_CACHE_CAPACITY; ++i) { EXPECT_FALSE(cache_lru.exists(i)); } - for (uint i = NUM_OF_TEST2_RECORDS - TEST2_CACHE_CAPACITY; i < NUM_OF_TEST2_RECORDS; ++i) { + for (unsigned int i = NUM_OF_TEST2_RECORDS - TEST2_CACHE_CAPACITY; i < NUM_OF_TEST2_RECORDS; ++i) { EXPECT_TRUE(cache_lru.exists(i)); EXPECT_EQ((int)i, cache_lru.get(i)); }