From c3acb2147591aaafa1ece778617c4c62c88ecb41 Mon Sep 17 00:00:00 2001 From: dongsenhao Date: Mon, 22 May 2023 14:29:16 +0800 Subject: [PATCH] Modify irregular Virtual function Signed-off-by: dongsenhao --- libpurgeablemem/cpp/include/purgeable_ashmem.h | 2 +- libpurgeablemem/cpp/include/purgeable_mem.h | 2 +- libpurgeablemem/cpp/include/purgeable_mem_base.h | 1 - libpurgeablemem/cpp/src/purgeable_mem_base.cpp | 7 +------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libpurgeablemem/cpp/include/purgeable_ashmem.h b/libpurgeablemem/cpp/include/purgeable_ashmem.h index bf5f78e..8ccfcf4 100644 --- a/libpurgeablemem/cpp/include/purgeable_ashmem.h +++ b/libpurgeablemem/cpp/include/purgeable_ashmem.h @@ -58,7 +58,7 @@ protected: bool Pin_() override; bool Unpin_() override; bool IsPurged_() override; - bool CreatePurgeableData_() override; + bool CreatePurgeableData_(); void AfterRebuildSucc_() override; std::string ToString_() const override; }; diff --git a/libpurgeablemem/cpp/include/purgeable_mem.h b/libpurgeablemem/cpp/include/purgeable_mem.h index 85d617d..474aa7c 100644 --- a/libpurgeablemem/cpp/include/purgeable_mem.h +++ b/libpurgeablemem/cpp/include/purgeable_mem.h @@ -38,7 +38,7 @@ protected: bool Pin_() override; bool Unpin_() override; bool IsPurged_() override; - bool CreatePurgeableData_() override; + bool CreatePurgeableData_(); void AfterRebuildSucc_() override; std::string ToString_() const override; }; diff --git a/libpurgeablemem/cpp/include/purgeable_mem_base.h b/libpurgeablemem/cpp/include/purgeable_mem_base.h index 2c2a8e0..b11133f 100644 --- a/libpurgeablemem/cpp/include/purgeable_mem_base.h +++ b/libpurgeablemem/cpp/include/purgeable_mem_base.h @@ -110,7 +110,6 @@ protected: virtual bool Pin_(); virtual bool Unpin_(); virtual bool IsPurged_(); - virtual bool CreatePurgeableData_(); virtual void AfterRebuildSucc_(); virtual std::string ToString_() const; }; diff --git a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp index 1e6d541..ead9245 100644 --- a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp +++ b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp @@ -107,7 +107,7 @@ void PurgeableMemBase::EndRead() bool PurgeableMemBase::BeginWrite() { PM_HILOG_DEBUG(LOG_CORE, "%{public}s %{public}s", __func__, ToString_().c_str()); - if (dataPtr_ == nullptr && !CreatePurgeableData_()) { + if (dataPtr_ == nullptr) { return false; } IF_NULL_LOG_ACTION(dataPtr_, "dataPtr is nullptr in BeginWrite", return false); @@ -211,11 +211,6 @@ bool PurgeableMemBase::BuildContent_() return succ; } -bool PurgeableMemBase::CreatePurgeableData_() -{ - return false; -} - void PurgeableMemBase::ResizeData(size_t newSize) { } -- Gitee