From 000a5ee614c8973aabb51bbfecf5fe6802a112a7 Mon Sep 17 00:00:00 2001 From: M Starch Date: Thu, 28 Apr 2022 19:31:05 -0700 Subject: [PATCH] lestarch: making zero time use external linkage and a singular definition (#1428) --- Fw/Time/Time.cpp | 1 + Fw/Time/Time.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Fw/Time/Time.cpp b/Fw/Time/Time.cpp index f5795cce6b1..d75f506e176 100644 --- a/Fw/Time/Time.cpp +++ b/Fw/Time/Time.cpp @@ -2,6 +2,7 @@ #include namespace Fw { + const Time ZERO_TIME = Time(); Time::Time() : m_seconds(0), m_useconds(0), m_timeBase(TB_NONE), m_timeContext(0) { } diff --git a/Fw/Time/Time.hpp b/Fw/Time/Time.hpp index 958cb14f5bb..249f389137b 100644 --- a/Fw/Time/Time.hpp +++ b/Fw/Time/Time.hpp @@ -86,7 +86,7 @@ namespace Fw { TimeBase m_timeBase; // !< basis of time (defined by system) FwTimeContextStoreType m_timeContext; // !< user settable value. Could be reboot count, node, etc }; - const static Time ZERO_TIME = Time(); + extern const Time ZERO_TIME; }