commit 3a62ee15d4edd8498adbfaf3abd23796a7655ee7
author Patrick Williams <patrick@stwcx.xyz> Fri Dec 03 10:13:25 2021 -0600
committer Patrick Williams <patrick@stwcx.xyz> Fri Dec 03 10:14:13 2021 -0600
tree 0d2c1b416192acb413562feb9d25294a037b24a6
parent e28aa53dc1492f09a64dc9f1dbfd5b6dba06e31f

sensor: add missing header for sdbusplus::bus::match

Telemetry doesn't seem to compile with the latest version of sdbusplus
because of a missing header file.  Add this in.

Also, recently sdbusplus added short-named aliases for many types, so
switch match::match to just match_t.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I4946edfa39db741bab8e30ffd77f03bf59c4d6f3

src/sensor.cpp

diff --git a/src/sensor.cpp b/src/sensor.cpp
index f26a964..6e9eae8 100644
--- a/src/sensor.cpp
+++ b/src/sensor.cpp
@@ -132,7 +132,7 @@
                        sensorId.path +
                        "',arg0='xyz.openbmc_project.Sensor.Value'"s;
 
-    signalMonitor = std::make_unique<sdbusplus::bus::match::match>(
+    signalMonitor = std::make_unique<sdbusplus::bus::match_t>(
         *bus, param,
         [weakSelf = weak_from_this()](sdbusplus::message::message& message) {
             signalProc(weakSelf, message);

src/sensor.hpp

diff --git a/src/sensor.hpp b/src/sensor.hpp
index 23c3d5c..3393b06 100644
--- a/src/sensor.hpp
+++ b/src/sensor.hpp
@@ -7,6 +7,7 @@
 
 #include <boost/asio/high_resolution_timer.hpp>
 #include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/bus/match.hpp>
 
 #include <memory>
 
@@ -51,5 +52,5 @@
     std::vector<std::weak_ptr<interfaces::SensorListener>> listeners;
     uint64_t timestamp = 0;
     std::optional<double> value;
-    std::unique_ptr<sdbusplus::bus::match::match> signalMonitor;
+    std::unique_ptr<sdbusplus::bus::match_t> signalMonitor;
 };

tests/src/test_report.cpp

diff --git a/tests/src/test_report.cpp b/tests/src/test_report.cpp
index f5f84c1..ccdcce8 100644
--- a/tests/src/test_report.cpp
+++ b/tests/src/test_report.cpp
@@ -532,14 +532,14 @@
 
     void makeMonitor()
     {
-        monitor = std::make_unique<sdbusplus::bus::match::match>(
+        monitor = std::make_unique<sdbusplus::bus::match_t>(
             *DbusEnvironment::getBus(),
             sdbusplus::bus::match::rules::propertiesChanged(
                 sut->getPath(), Report::reportIfaceName),
             [this](auto& msg) { monitorProc(msg); });
     }
 
-    std::unique_ptr<sdbusplus::bus::match::match> monitor;
+    std::unique_ptr<sdbusplus::bus::match_t> monitor;
     MockFunction<void()> readingsUpdated;
 };