From e0f48073e396ac3857cefefe00ba714c00350440 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 17 Nov 2020 20:09:41 -0700 Subject: [PATCH] minor cleanup, but with C++17 features --- src/EnergyPlus/CurveManager.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/EnergyPlus/CurveManager.cc b/src/EnergyPlus/CurveManager.cc index 0b390aba203..ad664d7cc27 100644 --- a/src/EnergyPlus/CurveManager.cc +++ b/src/EnergyPlus/CurveManager.cc @@ -2709,7 +2709,7 @@ namespace CurveManager { using namespace DataIPShortCuts; // SUBROUTINE PARAMETER DEFINITIONS: - constexpr auto CurveObjectName = "Curve:Functional:PressureDrop"; + constexpr std::string_view CurveObjectName = "Curve:Functional:PressureDrop"; // SUBROUTINE LOCAL VARIABLE DECLARATIONS: int NumPressure; @@ -2721,11 +2721,11 @@ namespace CurveManager { bool ErrsFound(false); // Set to true if errors in input, fatal at end of routine int CurveNum; - NumPressure = inputProcessor->getNumObjectsFound(state, CurveObjectName); + NumPressure = inputProcessor->getNumObjectsFound(state, CurveObjectName.data()); DataBranchAirLoopPlant::PressureCurve.allocate(NumPressure); for (CurveNum = 1; CurveNum <= NumPressure; ++CurveNum) { inputProcessor->getObjectItem(state, - CurveObjectName, + CurveObjectName.data(), CurveNum, Alphas, NumAlphas, @@ -2736,7 +2736,7 @@ namespace CurveManager { _, cAlphaFieldNames, cNumericFieldNames); - GlobalNames::VerifyUniqueInterObjectName(state, state.dataCurveManager->UniqueCurveNames, Alphas(1), CurveObjectName, cAlphaFieldNames(1), ErrsFound); + GlobalNames::VerifyUniqueInterObjectName(state, state.dataCurveManager->UniqueCurveNames, Alphas(1), CurveObjectName.data(), cAlphaFieldNames(1), ErrsFound); DataBranchAirLoopPlant::PressureCurve(CurveNum).Name = Alphas(1); DataBranchAirLoopPlant::PressureCurve(CurveNum).EquivDiameter = Numbers(1); DataBranchAirLoopPlant::PressureCurve(CurveNum).MinorLossCoeff = Numbers(2);