From 566dd112ff07ef7c4f2e017ee96061392194f2e4 Mon Sep 17 00:00:00 2001 From: m-aXimilian <56168660+m-aXimilian@users.noreply.github.com> Date: Mon, 28 Jul 2025 08:46:16 +0000 Subject: [PATCH] Rename UpdateResouce to ModifyResource (#4) For some reason it seems as if UpdateResource is already defined in some (other) dependency of Pixelarium. Instead of throwing around platform specific macros to fix the Windows build for correct mangling, I decided to simply rename the function. Fixes #3 --- lib/resources/resource.cpp | 2 +- lib/resources/resource.hpp | 6 +++--- tests/lib/resources/test_resource.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/resources/resource.cpp b/lib/resources/resource.cpp index dd4f39b..3c6e81e 100644 --- a/lib/resources/resource.cpp +++ b/lib/resources/resource.cpp @@ -42,7 +42,7 @@ size_t pixelarium::resources::ImageResourcePool::SetResource(unique_ptr res) +bool pixelarium::resources::ImageResourcePool::ModifyResource(size_t id, std::unique_ptr res) { auto search{this->resources_.find(id)}; if (search == this->resources_.end()) return false; diff --git a/lib/resources/resource.hpp b/lib/resources/resource.hpp index 45380d1..61e17a8 100644 --- a/lib/resources/resource.hpp +++ b/lib/resources/resource.hpp @@ -11,7 +11,7 @@ namespace pixelarium::resources { struct IResource { - virtual ~IResource() = 0; + virtual ~IResource() = default; }; template @@ -25,7 +25,7 @@ class IResourcePool virtual ~IResourcePool() = default; virtual std::optional GetResource(size_t id) const = 0; virtual size_t SetResource(std::unique_ptr res) = 0; - virtual bool UpdateResource(size_t id, std::unique_ptr res) = 0; + virtual bool ModifyResource(size_t id, std::unique_ptr res) = 0; virtual bool DeleteResource(size_t id) = 0; virtual void EnumerateResources(const std::function& func) = 0; }; @@ -47,7 +47,7 @@ class ImageResourcePool : public IResourcePool std::optional GetResource(size_t id) const override; size_t SetResource(std::unique_ptr res) override; - bool UpdateResource(size_t id, std::unique_ptr res) override; + bool ModifyResource(size_t id, std::unique_ptr res) override; bool DeleteResource(size_t id) override; void EnumerateResources(const std::function& func) override; diff --git a/tests/lib/resources/test_resource.cpp b/tests/lib/resources/test_resource.cpp index 4beb72b..69fcb97 100644 --- a/tests/lib/resources/test_resource.cpp +++ b/tests/lib/resources/test_resource.cpp @@ -43,22 +43,22 @@ TEST(ImageResourcePoolTest, GetNonExistentResourceReturnsEmptyOptional) EXPECT_FALSE(pool.GetResource(12345)); } -TEST(ImageResourcePoolTest, UpdateResourceSuccess) +TEST(ImageResourcePoolTest, ModifyResourceSuccess) { ImageResourcePool pool; auto id = pool.SetResource(std::make_unique()); auto new_img = std::make_unique(); - EXPECT_TRUE(pool.UpdateResource(id, std::move(new_img))); + EXPECT_TRUE(pool.ModifyResource(id, std::move(new_img))); auto res = pool.GetResource(id); EXPECT_TRUE(res.has_value()); EXPECT_NE(res.value(), nullptr); } -TEST(ImageResourcePoolTest, UpdateResourceFail) +TEST(ImageResourcePoolTest, ModifyResourceFail) { ImageResourcePool pool; auto new_img = std::make_unique(); - EXPECT_FALSE(pool.UpdateResource(999, std::move(new_img))); + EXPECT_FALSE(pool.ModifyResource(999, std::move(new_img))); } TEST(ImageResourcePoolTest, DeleteResourceSuccess)