From fb18b639e33c6b5f1b9e0cfeaac1240805dc27f5 Mon Sep 17 00:00:00 2001 From: Scott Freeman Date: Mon, 6 Jan 2020 16:36:58 -0500 Subject: [PATCH] Using wstring::find_last_not_of in CalcManager::NumberFormattingUtils::TrimTrailingZeroes (#898) --- src/CalcManager/NumberFormattingUtils.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/CalcManager/NumberFormattingUtils.cpp b/src/CalcManager/NumberFormattingUtils.cpp index 133fdda..ead9013 100644 --- a/src/CalcManager/NumberFormattingUtils.cpp +++ b/src/CalcManager/NumberFormattingUtils.cpp @@ -16,14 +16,11 @@ namespace CalcManager::NumberFormattingUtils return; } - for (auto iter = number.end() - 1;; iter--) + if (auto i = number.find_last_not_of(L'0'); i != wstring::npos) { - if (*iter != L'0') - { - number.erase(iter + 1, number.end()); - break; - } + number.erase(number.cbegin() + i + 1, number.cend()); } + if (number.back() == L'.') { number.pop_back();