From 72f1d25bc4d956b9c4b5c4b3db489798b35614b8 Mon Sep 17 00:00:00 2001 From: Marukyu Date: Fri, 6 May 2016 21:36:27 +0200 Subject: [PATCH] Fixed compile error on Windows if wchar_t and TCHAR do not match --- src/Client/System/GameDirectoryGuesser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Client/System/GameDirectoryGuesser.cpp b/src/Client/System/GameDirectoryGuesser.cpp index c0f3dd9..a24a3cd 100644 --- a/src/Client/System/GameDirectoryGuesser.cpp +++ b/src/Client/System/GameDirectoryGuesser.cpp @@ -22,8 +22,8 @@ std::vector GameDirectoryGuesser::getDirectoryList() SHGetFolderPath(nullptr, CSIDL_PROGRAM_FILES, nullptr, 0, programFilesDirectory); SHGetFolderPath(nullptr, CSIDL_PROGRAM_FILESX86, nullptr, 0, programFilesX86Directory); - std::wstring programFilesW(programFilesDirectory); - std::wstring programFilesX86W(programFilesX86Directory); + std::basic_string programFilesW(programFilesDirectory); + std::basic_string programFilesX86W(programFilesX86Directory); std::string programFilesA(programFilesW.begin(), programFilesW.end()); std::string programFilesX86A(programFilesX86W.begin(), programFilesX86W.end());