From: Tomek Mrugalski <tomek@isc.org>
Date: Tue, 14 Jul 2020 13:18:34 +0000 (+0200)
Subject: [#1174] Observation fixed after rebase
X-Git-Tag: Kea-1.7.10~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=109b6d14afb83b32d162c7022bbd0f905fb1f848;p=thirdparty%2Fkea.git

[#1174] Observation fixed after rebase
---

diff --git a/src/lib/stats/observation.cc b/src/lib/stats/observation.cc
index 711df8874a..2128f53a59 100644
--- a/src/lib/stats/observation.cc
+++ b/src/lib/stats/observation.cc
@@ -24,7 +24,7 @@ Observation::default_max_sample_count_ = std::make_pair(true, 20);
 
 std::pair<bool, StatsDuration>
 Observation::default_max_sample_age_ =
-    std::make_pair(false, time_duration(0, 0, 0, 0));
+    std::make_pair(false, StatsDuration::zero());
 
 Observation::Observation(const std::string& name, const int64_t value) :
     name_(name), type_(STAT_INTEGER),
diff --git a/src/lib/stats/observation.h b/src/lib/stats/observation.h
index f1c6583e48..068694f000 100644
--- a/src/lib/stats/observation.h
+++ b/src/lib/stats/observation.h
@@ -402,8 +402,7 @@ private:
     ///
     /// By default the MaxSampleCount is set to 20
     /// and MaxSampleAge is disabled
-    std::pair<bool, StatsDuration> max_sample_age_ = std::make_pair(false,
-        StatsDuration::zero());
+    static std::pair<bool, StatsDuration> default_max_sample_age_;
 
     /// @defgroup samples_storage Storage for supported observations
     ///