Deinline destructors in metrics, fnet, jrt_test logd

1 files changed, 18 insertions, 11 deletions

diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index 615baeccf43..604e9c46b80 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -898,13 +898,17 @@ struct NestedDimensionTestMetricSet : MetricSet
 {
     DimensionTestMetricSet nestedSet;
 
-    NestedDimensionTestMetricSet()
-        : MetricSet("outer", {{"fancy", "stuff"}}, ""),
-          nestedSet(this)
-    {
-    }
+    NestedDimensionTestMetricSet();
+    ~NestedDimensionTestMetricSet();
 };
 
+NestedDimensionTestMetricSet::NestedDimensionTestMetricSet()
+    : MetricSet("outer", {{"fancy", "stuff"}}, ""),
+      nestedSet(this)
+{
+}
+NestedDimensionTestMetricSet::~NestedDimensionTestMetricSet() = default;
+
 }
 
 TEST_F(MetricManagerTest, json_output_can_nest_dimensions_from_multiple_metric_sets)
@@ -933,13 +937,16 @@ struct DimensionOverridableTestMetricSet : MetricSet
 {
     DoubleValueMetric val;
 
-    DimensionOverridableTestMetricSet(const std::string& dimValue,
-                                MetricSet* owner = nullptr)
-        : MetricSet("temp", {{"foo", dimValue}}, "", owner),
-          val("val", {}, "val desc", this)
-    { }
+    DimensionOverridableTestMetricSet(const std::string& dimValue, MetricSet* owner = nullptr);
+    ~DimensionOverridableTestMetricSet() override;
 };
 
+DimensionOverridableTestMetricSet::DimensionOverridableTestMetricSet(const std::string& dimValue, MetricSet* owner)
+    : MetricSet("temp", {{"foo", dimValue}}, "", owner),
+      val("val", {}, "val desc", this)
+{ }
+DimensionOverridableTestMetricSet::~DimensionOverridableTestMetricSet() = default;
+
 struct SameNamesTestMetricSet : MetricSet
 {
     DimensionOverridableTestMetricSet set1;
@@ -954,7 +961,7 @@ SameNamesTestMetricSet::SameNamesTestMetricSet()
       set1("bar", this),
       set2("baz", this)
 { }
-SameNamesTestMetricSet::~SameNamesTestMetricSet() { }
+SameNamesTestMetricSet::~SameNamesTestMetricSet() = default;
 
 }