Magic-Mirror/x64dbg
1
0
Fork 0
mirror of https://github.com/x64dbg/x64dbg.git synced 2024-11-30 08:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix VS2015 compilation (#1194)

Browse Source 
Add this month's VS db extension to .gitignore
This commit is contained in:
Matthijs Lavrijsen 2016-10-24 18:53:14 +02:00 committed by Duncan Ogilvie
parent 4d24d2df78
commit f8a1f3f18a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,6 +27,7 @@ CppDependOut/
*.opensdf *.opensdf
*.sdf *.sdf
*.suo *.suo
*.VC.opendb
*.autosave *.autosave
*.~vsd *.~vsd
*.dll *.dll

4
src/dbg/commands/cmd-searching.cpp
View File

@ -583,7 +583,7 @@ bool cbInstrModCallFind(int argc, char* argv[])
struct GUIDHashObject struct GUIDHashObject
{ {
inline size_t operator()(const GUID & ref) inline size_t operator()(const GUID & ref) const
{ {
size_t* p = (size_t*)&ref; size_t* p = (size_t*)&ref;
#ifdef _WIN64 #ifdef _WIN64
@ -598,7 +598,7 @@ struct GUIDHashObject
struct GUIDEqualObject struct GUIDEqualObject
{ {
inline bool operator()(const GUID & a, const GUID & b) inline bool operator()(const GUID & a, const GUID & b) const
{ {
return memcmp(&a, &b, sizeof(GUID)) == 0; return memcmp(&a, &b, sizeof(GUID)) == 0;
}; };

10
src/gui/Src/Gui/MainWindow.cpp
View File

@ -1833,15 +1833,15 @@ static void setupMenuCustomizationHelper(QMenu* parentMenu, QList<QAction*> & st
void MainWindow::setupMenuCustomization() void MainWindow::setupMenuCustomization()
{ {
mFileMenuStrings.append(reinterpret_cast<QAction*>("File")); mFileMenuStrings.append(reinterpret_cast<QAction* const&>("File"));
setupMenuCustomizationHelper(ui->menuFile, mFileMenuStrings); setupMenuCustomizationHelper(ui->menuFile, mFileMenuStrings);
mDebugMenuStrings.append(reinterpret_cast<QAction*>("Debug")); mDebugMenuStrings.append(reinterpret_cast<QAction* const&>("Debug"));
setupMenuCustomizationHelper(ui->menuDebug, mDebugMenuStrings); setupMenuCustomizationHelper(ui->menuDebug, mDebugMenuStrings);
mOptionsMenuStrings.append(reinterpret_cast<QAction*>("Option")); mOptionsMenuStrings.append(reinterpret_cast<QAction* const&>("Option"));
setupMenuCustomizationHelper(ui->menuOptions, mOptionsMenuStrings); setupMenuCustomizationHelper(ui->menuOptions, mOptionsMenuStrings);
mHelpMenuStrings.append(reinterpret_cast<QAction*>("Help")); mHelpMenuStrings.append(reinterpret_cast<QAction* const&>("Help"));
setupMenuCustomizationHelper(ui->menuHelp, mHelpMenuStrings); setupMenuCustomizationHelper(ui->menuHelp, mHelpMenuStrings);
mViewMenuStrings.append(reinterpret_cast<QAction*>("View")); mViewMenuStrings.append(reinterpret_cast<QAction* const&>("View"));
setupMenuCustomizationHelper(ui->menuView, mViewMenuStrings); setupMenuCustomizationHelper(ui->menuView, mViewMenuStrings);
onMenuCustomized(); onMenuCustomized();
Config()->registerMainMenuStringList(&mFileMenuStrings); Config()->registerMainMenuStringList(&mFileMenuStrings);