From cedc008fd05ca86fc3bdac0e7431fe34db2a7fc5 Mon Sep 17 00:00:00 2001
From: Thomas Moulard <tmoulard@amazon.com>
Date: Tue, 10 Dec 2019 22:52:02 -0800
Subject: [PATCH] Fix function erroneously declared as static

Functions declared in headers should never be static.
In the previous implementation, statisticsDataToString was duplicated
in each compilation unit as the function was both defined in the header
and declared as static.

Signed-off-by: Thomas Moulard <tmoulard@amazon.com>
---
 system_metrics_collector/CMakeLists.txt       |  1 +
 .../src/moving_average_statistics/types.cpp   | 32 +++++++++++++++++++
 .../src/moving_average_statistics/types.hpp   |  9 +-----
 3 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 system_metrics_collector/src/moving_average_statistics/types.cpp

diff --git a/system_metrics_collector/CMakeLists.txt b/system_metrics_collector/CMakeLists.txt
index d7debe9b..674f0840 100644
--- a/system_metrics_collector/CMakeLists.txt
+++ b/system_metrics_collector/CMakeLists.txt
@@ -35,6 +35,7 @@ find_package(rcutils REQUIRED)
 
 add_library(system_metrics_collector SHARED
   src/moving_average_statistics/moving_average.cpp
+  src/moving_average_statistics/types.cpp
   src/moving_average_statistics/types.hpp
   src/system_metrics_collector/metrics_message_publisher.cpp
   src/system_metrics_collector/collector.cpp
diff --git a/system_metrics_collector/src/moving_average_statistics/types.cpp b/system_metrics_collector/src/moving_average_statistics/types.cpp
new file mode 100644
index 00000000..6d7f57c8
--- /dev/null
+++ b/system_metrics_collector/src/moving_average_statistics/types.cpp
@@ -0,0 +1,32 @@
+// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <sstream>
+#include <string>
+
+#include "types.hpp"
+
+namespace moving_average_statistics
+{
+
+std::string statisticsDataToString(const StatisticData & results)
+{
+  std::stringstream ss;
+  ss << "avg=" << results.average << ", min=" << results.min <<
+    ", max=" << results.max << ", std_dev=" <<
+    results.standard_deviation << ", count=" << results.sample_count;
+  return ss.str();
+}
+
+}  // namespace moving_average_statistics
diff --git a/system_metrics_collector/src/moving_average_statistics/types.hpp b/system_metrics_collector/src/moving_average_statistics/types.hpp
index 63db90af..a48ca3f6 100644
--- a/system_metrics_collector/src/moving_average_statistics/types.hpp
+++ b/system_metrics_collector/src/moving_average_statistics/types.hpp
@@ -41,14 +41,7 @@ struct StatisticData
  * @return std::string formatted struct contents in an easily readable format, e.g.,
  * /"avg=1, min=2, max=3, std_dev=4, count=5/"
  */
-static std::string statisticsDataToString(const StatisticData & results)
-{
-  std::stringstream ss;
-  ss << "avg=" << std::to_string(results.average) << ", min=" << std::to_string(results.min) <<
-    ", max=" << std::to_string(results.max) << ", std_dev=" << std::to_string(
-    results.standard_deviation) << ", count=" << std::to_string(results.sample_count);
-  return ss.str();
-}
+std::string statisticsDataToString(const StatisticData & results);
 
 }  // namespace moving_average_statistics