diff options
| author | Stefan Boberg <[email protected]> | 2024-12-02 19:23:54 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2024-12-03 09:33:58 +0100 |
| commit | a7d7e63d6e834f7daaa9c16d18807d186c996edc (patch) | |
| tree | 8e1c508ef4af0fd50e21035adec4dc05095d8933 /src | |
| parent | 5.5.15 (diff) | |
| download | zen-a7d7e63d6e834f7daaa9c16d18807d186c996edc.tar.xz zen-a7d7e63d6e834f7daaa9c16d18807d186c996edc.zip | |
ODR violation fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/zenstore/gc.cpp | 4 |
1 files 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 = |