commit 3ea9ec2b2d660c4443cea3914e6dddc05d32f89b
author Patrick Williams <patrick@stwcx.xyz> Fri Nov 19 12:21:08 2021 -0600
committer Patrick Williams <patrick@stwcx.xyz> Tue Nov 23 18:51:47 2021 +0000
tree b2840e2c6d3451edf70aeb7ac8f20015ec196f83
parent c3a6908712204d55ba55eea9c5a4059bb9ed939e

sdbusplus: remove usage of deprecated alias

The alias `server::match` has been deprecated since 2016.  Use the new
alias under bus.

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

monitor/tach_sensor.cpp

diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
index 0c2d4d9..91b4091 100644
--- a/monitor/tach_sensor.cpp
+++ b/monitor/tach_sensor.cpp
@@ -132,7 +132,7 @@
 
         auto match = getMatchString(util::FAN_SENSOR_VALUE_INTF);
 
-        tachSignal = std::make_unique<sdbusplus::server::match::match>(
+        tachSignal = std::make_unique<sdbusplus::bus::match_t>(
             _bus, match.c_str(),
             [this](auto& msg) { this->handleTachChange(msg); });
 
@@ -140,7 +140,7 @@
         {
             match = getMatchString(_interface);
 
-            targetSignal = std::make_unique<sdbusplus::server::match::match>(
+            targetSignal = std::make_unique<sdbusplus::bus::match_t>(
                 _bus, match.c_str(),
                 [this](auto& msg) { this->handleTargetChange(msg); });
         }

monitor/tach_sensor.hpp

diff --git a/monitor/tach_sensor.hpp b/monitor/tach_sensor.hpp
index 27174f5..dc8814f 100644
--- a/monitor/tach_sensor.hpp
+++ b/monitor/tach_sensor.hpp
@@ -4,7 +4,7 @@
 
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
-#include <sdbusplus/server.hpp>
+#include <sdbusplus/bus/match.hpp>
 #include <sdeventplus/clock.hpp>
 #include <sdeventplus/event.hpp>
 #include <sdeventplus/utility/timer.hpp>
@@ -491,12 +491,12 @@
     /**
      * @brief The match object for the Value properties changed signal
      */
-    std::unique_ptr<sdbusplus::server::match::match> tachSignal;
+    std::unique_ptr<sdbusplus::bus::match_t> tachSignal;
 
     /**
      * @brief The match object for the Target properties changed signal
      */
-    std::unique_ptr<sdbusplus::server::match::match> targetSignal;
+    std::unique_ptr<sdbusplus::bus::match_t> targetSignal;
 
     /**
      * @brief The number of seconds to wait between a sensor being set