From 8de3d882a1b58dace13f45e5f2d0419772b956a1 Mon Sep 17 00:00:00 2001 From: Sacha Date: Sat, 19 Oct 2013 05:22:32 +1000 Subject: [PATCH] Buildfix for Qt, Qt5, Windows on Qt. --- Common/FileUtil.cpp | 2 +- Qt/mainwindow.cpp | 2 +- native | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index fa32532c5d..24f151ba92 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -120,7 +120,7 @@ static void StripTailDirSlashes(std::wstring &fname) if (i == 2 && fname[1] == ':' && fname[2] == '\\') return; - while (wcschr(_T(DIR_SEP_CHRS), fname[i])) + while (wcschr((const wchar_t*)_T(DIR_SEP_CHRS), fname[i])) fname[i--] = '\0'; } return; diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index de46338e3e..be4bd49f6a 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -375,7 +375,7 @@ void MainWindow::on_action_DebugSaveMapFile_triggered() void MainWindow::on_action_DebugResetSymbolTable_triggered() { - symbolMap.ResetSymbolMap(); + symbolMap.Clear(); notifyMapsLoaded(); } diff --git a/native b/native index 6b48226f89..644b781687 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 6b48226f898382cebf89901977940a980502a119 +Subproject commit 644b7816871673e6b9e9f441c2791f1bbe8e2cc5