commit 66558235ce5d7568439ce7618dd0ce77fcc0b69c
author Brandon Kim <brandonkim@google.com> Tue Nov 09 16:53:08 2021 -0800
committer Ed Tanous <ed@tanous.net> Sat Nov 13 18:12:15 2021 +0000
tree 76615a656d7d6cad501619704e6505c4056891a6
parent da98f095f25cc75af3c0268643bde2b21f5503e0

Take out array size for constexpr std::array

C++20 supports initializing array without size using std::to_array

Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: I7f955ddaf7c4368f364eae6ff401b0916f5cbe6f

src/HwmonTempMain.cpp

diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index 20af79d..7344b57 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -39,24 +39,24 @@
 static constexpr float pollRateDefault = 0.5;
 
 namespace fs = std::filesystem;
-static constexpr std::array<const char*, 17> sensorTypes = {
-    "xyz.openbmc_project.Configuration.EMC1412",
-    "xyz.openbmc_project.Configuration.EMC1413",
-    "xyz.openbmc_project.Configuration.EMC1414",
-    "xyz.openbmc_project.Configuration.MAX31725",
-    "xyz.openbmc_project.Configuration.MAX31730",
-    "xyz.openbmc_project.Configuration.MAX6581",
-    "xyz.openbmc_project.Configuration.MAX6654",
-    "xyz.openbmc_project.Configuration.NCT7802",
-    "xyz.openbmc_project.Configuration.SBTSI",
-    "xyz.openbmc_project.Configuration.LM95234",
-    "xyz.openbmc_project.Configuration.TMP112",
-    "xyz.openbmc_project.Configuration.TMP175",
-    "xyz.openbmc_project.Configuration.TMP421",
-    "xyz.openbmc_project.Configuration.TMP441",
-    "xyz.openbmc_project.Configuration.LM75A",
-    "xyz.openbmc_project.Configuration.TMP75",
-    "xyz.openbmc_project.Configuration.W83773G"};
+static auto sensorTypes{
+    std::to_array<const char*>({"xyz.openbmc_project.Configuration.EMC1412",
+                                "xyz.openbmc_project.Configuration.EMC1413",
+                                "xyz.openbmc_project.Configuration.EMC1414",
+                                "xyz.openbmc_project.Configuration.MAX31725",
+                                "xyz.openbmc_project.Configuration.MAX31730",
+                                "xyz.openbmc_project.Configuration.MAX6581",
+                                "xyz.openbmc_project.Configuration.MAX6654",
+                                "xyz.openbmc_project.Configuration.NCT7802",
+                                "xyz.openbmc_project.Configuration.SBTSI",
+                                "xyz.openbmc_project.Configuration.LM95234",
+                                "xyz.openbmc_project.Configuration.TMP112",
+                                "xyz.openbmc_project.Configuration.TMP175",
+                                "xyz.openbmc_project.Configuration.TMP421",
+                                "xyz.openbmc_project.Configuration.TMP441",
+                                "xyz.openbmc_project.Configuration.LM75A",
+                                "xyz.openbmc_project.Configuration.TMP75",
+                                "xyz.openbmc_project.Configuration.W83773G"})};
 
 void createSensors(
     boost::asio::io_service& io, sdbusplus::asio::object_server& objectServer,