diff --git a/src/CalcManager/CEngine/calc.cpp b/src/CalcManager/CEngine/calc.cpp index 6f93a600..f09151fe 100644 --- a/src/CalcManager/CEngine/calc.cpp +++ b/src/CalcManager/CEngine/calc.cpp @@ -19,8 +19,8 @@ static constexpr long DEFAULT_RADIX = 10; static constexpr wchar_t DEFAULT_DEC_SEPARATOR = L'.'; static constexpr wchar_t DEFAULT_GRP_SEPARATOR = L','; -static constexpr wstring_view DEFAULT_GRP_STR = L"3;0"; -static constexpr wstring_view DEFAULT_NUMBER_STR = L"0"; +static constexpr wstring_view DEFAULT_GRP_STR = L"3;0"sv; +static constexpr wstring_view DEFAULT_NUMBER_STR = L"0"sv; // Read strings for keys, errors, trig types, etc. // These will be copied from the resources to local memory. diff --git a/src/CalcManager/CEngine/scidisp.cpp b/src/CalcManager/CEngine/scidisp.cpp index e01cc239..63c239cf 100644 --- a/src/CalcManager/CEngine/scidisp.cpp +++ b/src/CalcManager/CEngine/scidisp.cpp @@ -20,8 +20,8 @@ using namespace CalcEngine; constexpr int MAX_EXPONENT = 4; constexpr uint32_t MAX_GROUPING_SIZE = 16; -constexpr wstring_view c_decPreSepStr = L"[+-]?(\\d*)["; -constexpr wstring_view c_decPostSepStr = L"]?(\\d*)(?:e[+-]?(\\d*))?$"; +constexpr wstring_view c_decPreSepStr = L"[+-]?(\\d*)["sv; +constexpr wstring_view c_decPostSepStr = L"]?(\\d*)(?:e[+-]?(\\d*))?$"sv; /****************************************************************************\