github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace _wtoi by wcstol

Browse source
This commit is contained in:
fwcd 2019-04-05 16:36:05 +02:00
commit 12032259fd
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcManager/UnitConverter.cpp
View file

@ -220,7 +220,7 @@ Category UnitConverter::StringToCategory(const wstring& w)
vector<wstring> tokenList = StringToVector(w, L";"); vector<wstring> tokenList = StringToVector(w, L";");
assert(tokenList.size() == EXPECTEDSERIALIZEDCATEGORYTOKENCOUNT); assert(tokenList.size() == EXPECTEDSERIALIZEDCATEGORYTOKENCOUNT);
Category serializedCategory; Category serializedCategory;
serializedCategory.id = _wtoi(Unquote(tokenList[0]).c_str()); serializedCategory.id = wcstol(Unquote(tokenList[0]).c_str(), 0, 10);
serializedCategory.supportsNegative = (tokenList[1].compare(L"1") == 0); serializedCategory.supportsNegative = (tokenList[1].compare(L"1") == 0);
serializedCategory.name = Unquote(tokenList[2]); serializedCategory.name = Unquote(tokenList[2]);
return serializedCategory; return serializedCategory;
@ -238,7 +238,7 @@ Unit UnitConverter::StringToUnit(const wstring& w)
vector<wstring> tokenList = StringToVector(w, L";"); vector<wstring> tokenList = StringToVector(w, L";");
assert(tokenList.size() == EXPECTEDSERIALIZEDUNITTOKENCOUNT); assert(tokenList.size() == EXPECTEDSERIALIZEDUNITTOKENCOUNT);
Unit serializedUnit; Unit serializedUnit;
serializedUnit.id = _wtoi(Unquote(tokenList[0]).c_str()); serializedUnit.id = wcstol(Unquote(tokenList[0]).c_str(), 0, 10);
serializedUnit.name = Unquote(tokenList[1]); serializedUnit.name = Unquote(tokenList[1]);
serializedUnit.accessibleName = serializedUnit.name; serializedUnit.accessibleName = serializedUnit.name;
serializedUnit.abbreviation = Unquote(tokenList[2]); serializedUnit.abbreviation = Unquote(tokenList[2]);