From a7d7e63d6e834f7daaa9c16d18807d186c996edc Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Mon, 2 Dec 2024 19:23:54 +0100 Subject: ODR violation fix --- src/zenstore/gc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp index f2901c4ee..9534d93f5 100644 --- a/src/zenstore/gc.cpp +++ b/src/zenstore/gc.cpp @@ -181,7 +181,7 @@ namespace { ////////////////////////////////////////////////////////////////////////// CbObject -LoadCompactBinaryObject(const fs::path& Path) +LoadCompactBinaryObjectNoThrow(const fs::path& Path) { FileContents Result = ReadFile(Path); @@ -1561,7 +1561,7 @@ GcScheduler::Initialize(const GcSchedulerConfig& Config) m_LastGcExpireTime = GcClock::TimePoint::min(); m_AttachmentPassIndex = 0; - if (CbObject SchedulerState = LoadCompactBinaryObject(Config.RootDirectory / "gc_state")) + if (CbObject SchedulerState = LoadCompactBinaryObjectNoThrow(Config.RootDirectory / "gc_state")) { m_LastGcTime = GcClock::TimePoint(GcClock::Duration(SchedulerState["LastGcTime"sv].AsInt64())); m_LastGcExpireTime = -- cgit v1.2.3