From af2a41282c9ecb8fc8a54557079ab4bcb957b350 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Thu, 12 Sep 2024 14:01:48 +0200 Subject: Placate clang --- src/zenserver/projectstore/projectstore.cpp | 8 ++++---- src/zenserver/projectstore/projectstore.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/zenserver') diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index d47b4e50b..b58f490e2 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -2032,14 +2032,14 @@ ProjectStore::Oplog::IterateFileMap( } void -ProjectStore::Oplog::IterateOplog(std::function&& Handler, const Paging& EntryPaging) +ProjectStore::Oplog::IterateOplog(std::function&& Handler, const Paging* EntryPaging) { RwLock::SharedLockScope _(m_OplogLock); IterateOplogLocked(std::move(Handler), EntryPaging); } void -ProjectStore::Oplog::IterateOplogLocked(std::function&& Handler, const Paging& EntryPaging) +ProjectStore::Oplog::IterateOplogLocked(std::function&& Handler, const Paging* EntryPaging) { ZEN_TRACE_CPU("Store::Oplog::IterateOplogLocked"); if (!m_Storage) @@ -2063,9 +2063,9 @@ ProjectStore::Oplog::IterateOplogLocked(std::function&& Hand }); std::span EntrySpan; - if (EntryPaging.Start >= 0 || EntryPaging.Count >= 0) + if (EntryPaging != nullptr) { - int32_t Indices[2] = {EntryPaging.Start, EntryPaging.Start + EntryPaging.Count}; + int32_t Indices[2] = {EntryPaging->Start, EntryPaging->Start + EntryPaging->Count}; for (int32_t& Index : Indices) { Index = std::max(0, Index); diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h index c001293a9..10008f989 100644 --- a/src/zenserver/projectstore/projectstore.h +++ b/src/zenserver/projectstore/projectstore.h @@ -104,9 +104,9 @@ public: std::vector GetAllChunksInfo(); void IterateChunkMap(std::function&& Fn); void IterateFileMap(std::function&& Fn); - void IterateOplog(std::function&& Fn, const Paging& EntryPaging = {}); + void IterateOplog(std::function&& Fn, const Paging* EntryPaging = nullptr); void IterateOplogWithKey(std::function&& Fn); - void IterateOplogLocked(std::function&& Fn, const Paging& EntryPaging = {}); + void IterateOplogLocked(std::function&& Fn, const Paging* EntryPaging = nullptr); size_t GetOplogEntryCount() const; std::optional GetOpByKey(const Oid& Key); -- cgit v1.2.3