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
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index fad0020..a36c183 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -57,8 +57,8 @@
static constexpr size_t minSystemCfm = 50;
-constexpr const std::array<const char*, 2> monitorIfaces = {exitAirIface,
- cfmIface};
+constexpr const auto monitorIfaces{
+ std::to_array<const char*>({exitAirIface, cfmIface})};
static std::vector<std::shared_ptr<CFMSensor>> cfmSensors;
@@ -547,8 +547,8 @@
void ExitAirTempSensor::setupMatches(void)
{
- constexpr const std::array<const char*, 2> matchTypes = {
- "power", inletTemperatureSensor};
+ constexpr const auto matchTypes{
+ std::to_array<const char*>({"power", inletTemperatureSensor})};
std::weak_ptr<ExitAirTempSensor> weakRef = weak_from_this();
for (const std::string type : matchTypes)