From e6a132521b52c12eb70f1429c8e908e6590539ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCller?= Date: Tue, 18 Feb 2025 15:01:43 +0100 Subject: [PATCH] Fix inconsistent string stream naming --- src/BridgeRepair.cpp | 6 +++--- src/PlutonianPebbles.cpp | 4 ++-- src/PrintQueue.cpp | 2 +- src/RedNosedReports.cpp | 2 +- src/Solver.cpp | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/BridgeRepair.cpp b/src/BridgeRepair.cpp index 975fd8c..8b2a02f 100644 --- a/src/BridgeRepair.cpp +++ b/src/BridgeRepair.cpp @@ -32,7 +32,7 @@ const int BridgeRepair::getPuzzleDay() const void BridgeRepair::processDataLine(const std::string& line) { - std::istringstream stringStream{ line }; + std::istringstream stream{ line }; long long int testValue; char colon; @@ -41,8 +41,8 @@ void BridgeRepair::processDataLine(const std::string& line) // The precomputed numbers are used to facilitate the "concatenate" operator. std::vector> calibrationNumbers{}; - stringStream >> testValue >> colon; - while (stringStream >> calibrationNumber) + stream >> testValue >> colon; + while (stream >> calibrationNumber) { // Skips the precomputation for the first calibration numbers. int pow10{ 0 }; diff --git a/src/PlutonianPebbles.cpp b/src/PlutonianPebbles.cpp index f1005da..1fd64b3 100644 --- a/src/PlutonianPebbles.cpp +++ b/src/PlutonianPebbles.cpp @@ -36,9 +36,9 @@ void PlutonianPebbles::processDataLine(const std::string& line) std::shared_ptr> nextBlinkPebbles; // Adds initial pebbles numbers. - std::istringstream lineStream{ line }; + std::istringstream stream{ line }; long long int pebbleNumber; - while (lineStream >> pebbleNumber) + while (stream >> pebbleNumber) { addPebble(*currentPebbles, pebbleNumber, 1); } diff --git a/src/PrintQueue.cpp b/src/PrintQueue.cpp index f2b7c70..10c837e 100644 --- a/src/PrintQueue.cpp +++ b/src/PrintQueue.cpp @@ -89,7 +89,7 @@ void PrintQueue::processOrderingRule(const std::string& line) void PrintQueue::processUpdatePages(const std::string& line) { std::vector pages{}; - std::stringstream stream{ line }; + std::istringstream stream{ line }; std::string token; bool isCorrectOrder{ true }; // We completely construct 'pages' for part 2, even if the ordering is not correct. diff --git a/src/RedNosedReports.cpp b/src/RedNosedReports.cpp index c5e5bcc..835477e 100644 --- a/src/RedNosedReports.cpp +++ b/src/RedNosedReports.cpp @@ -35,7 +35,7 @@ void RedNosedReports::processDataLine(const std::string& line) { RedNosedReportData data{}; - std::stringstream stream{ line }; + std::istringstream stream{ line }; std::string token; std::getline(stream, token, ' '); data.levels.push_back(std::stoi(token)); diff --git a/src/Solver.cpp b/src/Solver.cpp index 50f9560..6217d5f 100644 --- a/src/Solver.cpp +++ b/src/Solver.cpp @@ -24,14 +24,14 @@ Solver::Solver(const int inputFileNameSuffix) const std::string Solver::getInputFileName() const { - std::ostringstream oss; - oss << clean(getPuzzleName()); + std::ostringstream stream; + stream << clean(getPuzzleName()); if (inputFileNameSuffix_ > 0) { - oss << "_" << inputFileNameSuffix_; + stream << "_" << inputFileNameSuffix_; } - oss << ".txt"; - return oss.str(); + stream << ".txt"; + return stream.str(); } long long int Solver::getResultPart1() const