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

Fixed merge conflict

Browse source
This commit is contained in:
Brett Waldbaum 2019-03-08 16:11:00 -08:00
commit 20687eb591
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CalcViewModel/Common/LocalizationSettings.h
View file

@ -177,7 +177,7 @@ namespace CalculatorApp
Platform::String^ GetEnglishValueFromLocalizedDigits(const std::wstring& localizedString) const Platform::String^ GetEnglishValueFromLocalizedDigits(const std::wstring& localizedString) const
{ {
if (!wcscmp(m_resolvedName, L"en-US")) if (!wcscmp((PCWSTR)m_resolvedName, L"en-US"))
{ {
return ref new Platform::String(localizedString.c_str()); return ref new Platform::String(localizedString.c_str());
} }