From 20687eb5918ad72e90b8ce30f91fba524afcbcae Mon Sep 17 00:00:00 2001 From: Brett Waldbaum Date: Fri, 8 Mar 2019 16:11:00 -0800 Subject: [PATCH] Fixed merge conflict --- src/CalcViewModel/Common/LocalizationSettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CalcViewModel/Common/LocalizationSettings.h b/src/CalcViewModel/Common/LocalizationSettings.h index 896a3157..aebb1876 100644 --- a/src/CalcViewModel/Common/LocalizationSettings.h +++ b/src/CalcViewModel/Common/LocalizationSettings.h @@ -177,7 +177,7 @@ namespace CalculatorApp 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()); }