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/PSUSensorMain.cpp

diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 779873e..4f7eb06 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -40,34 +40,34 @@
 
 static constexpr bool debug = false;
 
-static constexpr std::array<const char*, 27> sensorTypes = {
-    "xyz.openbmc_project.Configuration.ADM1266",
-    "xyz.openbmc_project.Configuration.ADM1272",
-    "xyz.openbmc_project.Configuration.ADM1275",
-    "xyz.openbmc_project.Configuration.ADM1278",
-    "xyz.openbmc_project.Configuration.DPS800",
-    "xyz.openbmc_project.Configuration.INA219",
-    "xyz.openbmc_project.Configuration.INA230",
-    "xyz.openbmc_project.Configuration.IPSPS",
-    "xyz.openbmc_project.Configuration.ISL68137",
-    "xyz.openbmc_project.Configuration.ISL68220",
-    "xyz.openbmc_project.Configuration.ISL68223",
-    "xyz.openbmc_project.Configuration.ISL69243",
-    "xyz.openbmc_project.Configuration.ISL69260",
-    "xyz.openbmc_project.Configuration.LM25066",
-    "xyz.openbmc_project.Configuration.MAX16601",
-    "xyz.openbmc_project.Configuration.MAX20710",
-    "xyz.openbmc_project.Configuration.MAX20730",
-    "xyz.openbmc_project.Configuration.MAX20734",
-    "xyz.openbmc_project.Configuration.MAX20796",
-    "xyz.openbmc_project.Configuration.MAX34451",
-    "xyz.openbmc_project.Configuration.pmbus",
-    "xyz.openbmc_project.Configuration.PXE1610",
-    "xyz.openbmc_project.Configuration.RAA228000",
-    "xyz.openbmc_project.Configuration.RAA228228",
-    "xyz.openbmc_project.Configuration.RAA229004",
-    "xyz.openbmc_project.Configuration.TPS546D24",
-    "xyz.openbmc_project.Configuration.XDPE12284"};
+static constexpr auto sensorTypes{std::to_array<const char*>(
+    {"xyz.openbmc_project.Configuration.ADM1266",
+     "xyz.openbmc_project.Configuration.ADM1272",
+     "xyz.openbmc_project.Configuration.ADM1275",
+     "xyz.openbmc_project.Configuration.ADM1278",
+     "xyz.openbmc_project.Configuration.DPS800",
+     "xyz.openbmc_project.Configuration.INA219",
+     "xyz.openbmc_project.Configuration.INA230",
+     "xyz.openbmc_project.Configuration.IPSPS",
+     "xyz.openbmc_project.Configuration.ISL68137",
+     "xyz.openbmc_project.Configuration.ISL68220",
+     "xyz.openbmc_project.Configuration.ISL68223",
+     "xyz.openbmc_project.Configuration.ISL69243",
+     "xyz.openbmc_project.Configuration.ISL69260",
+     "xyz.openbmc_project.Configuration.LM25066",
+     "xyz.openbmc_project.Configuration.MAX16601",
+     "xyz.openbmc_project.Configuration.MAX20710",
+     "xyz.openbmc_project.Configuration.MAX20730",
+     "xyz.openbmc_project.Configuration.MAX20734",
+     "xyz.openbmc_project.Configuration.MAX20796",
+     "xyz.openbmc_project.Configuration.MAX34451",
+     "xyz.openbmc_project.Configuration.pmbus",
+     "xyz.openbmc_project.Configuration.PXE1610",
+     "xyz.openbmc_project.Configuration.RAA228000",
+     "xyz.openbmc_project.Configuration.RAA228228",
+     "xyz.openbmc_project.Configuration.RAA229004",
+     "xyz.openbmc_project.Configuration.TPS546D24",
+     "xyz.openbmc_project.Configuration.XDPE12284"})};
 
 static std::vector<std::string> pmbusNames = {
     "adm1266",   "adm1272",   "adm1275",  "adm1278",  "dps800",    "ina219",