commit 84c188fef1847e6fd767d5eac1235d51ac392ec8
author Patrick Venture <venture@google.com> Mon Aug 10 12:39:12 2020 -0700
committer Patrick Venture <venture@google.com> Mon Aug 17 10:12:49 2020 -0700
tree b0d92108533336149f2c30a5fb6d119eacc9f8f7
parent 9b93692d44573553863de70347f48a727a3a273e

move util methods to dbusutil header

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ie57b106c2d4f28220986d0ab0324459dec2d6085

dbus/dbusutil.hpp

diff --git a/dbus/dbusutil.hpp b/dbus/dbusutil.hpp
index 54126cf..8bd2824 100644
--- a/dbus/dbusutil.hpp
+++ b/dbus/dbusutil.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdexcept>
+#include <string>
 
 namespace pid_control
 {
@@ -22,4 +23,9 @@
     }
 };
 
+std::string getSensorPath(const std::string& type, const std::string& id);
+std::string getMatch(const std::string& type, const std::string& id);
+void scaleSensorReading(const double min, const double max, double& value);
+bool validType(const std::string& type);
+
 } // namespace pid_control

util.hpp

diff --git a/util.hpp b/util.hpp
index 62c1e66..efe920c 100644
--- a/util.hpp
+++ b/util.hpp
@@ -32,11 +32,6 @@
     "xyz.openbmc_project.Sensor.Threshold.Critical";
 const std::string propertiesintf = "org.freedesktop.DBus.Properties";
 
-std::string getSensorPath(const std::string& type, const std::string& id);
-std::string getMatch(const std::string& type, const std::string& id);
-void scaleSensorReading(const double min, const double max, double& value);
-bool validType(const std::string& type);
-
 /*
  * Given a path that optionally has a glob portion, fill it out.
  */