commit 248d02303212eb1b7b9a81757489a23af36546a8
author Ed Tanous <edtanous@google.com> Tue Jan 04 20:47:01 2022 +0000
committer Ed Tanous <ed@tanous.net> Wed Jan 05 20:07:08 2022 +0000
tree ecae6fbf55b5e9d25268397b9ad41e377effab47
parent 1ec43ee36d52f415261b27653b1ba6311ebb5bfe

Make code compile with clang

One minor shadowed variable that needed it's name changed, and a missing
inline statement.

Tested: Code now builds in clang-13

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I83b662a2818e1469dfeb29b818338346e40cb832

redfish-core/include/event_service_manager.hpp

diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index 9349cd8..642a302 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -500,7 +500,7 @@
     }
 #endif
 
-    void filterAndSendReports(const std::string& id,
+    void filterAndSendReports(const std::string& reportId,
                               const telemetry::TimestampReadings& var)
     {
         std::string mrdUri = telemetry::metricReportDefinitionUri + ("/" + id);
@@ -517,11 +517,11 @@
         }
 
         nlohmann::json msg;
-        if (!telemetry::fillReport(msg, id, var))
+        if (!telemetry::fillReport(msg, reportId, var))
         {
             BMCWEB_LOG_ERROR << "Failed to fill the MetricReport for DBus "
                                 "Report with id "
-                             << id;
+                             << reportId;
             return;
         }
 

redfish-core/lib/trigger.hpp

diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp
index 210468c..bb0a0e2 100644
--- a/redfish-core/lib/trigger.hpp
+++ b/redfish-core/lib/trigger.hpp
@@ -137,7 +137,7 @@
     return std::make_optional(thresholds);
 }
 
-nlohmann::json
+inline nlohmann::json
     getMetricReportDefinitions(const std::vector<std::string>& reportNames)
 {
     nlohmann::json reports = nlohmann::json::array();