Fix VS2015 compilation (#1194)
Add this month's VS db extension to .gitignore
This commit is contained in:
parent
4d24d2df78
commit
f8a1f3f18a
|
@ -27,6 +27,7 @@ CppDependOut/
|
|||
*.opensdf
|
||||
*.sdf
|
||||
*.suo
|
||||
*.VC.opendb
|
||||
*.autosave
|
||||
*.~vsd
|
||||
*.dll
|
||||
|
|
|
@ -583,7 +583,7 @@ bool cbInstrModCallFind(int argc, char* argv[])
|
|||
|
||||
struct GUIDHashObject
|
||||
{
|
||||
inline size_t operator()(const GUID & ref)
|
||||
inline size_t operator()(const GUID & ref) const
|
||||
{
|
||||
size_t* p = (size_t*)&ref;
|
||||
#ifdef _WIN64
|
||||
|
@ -598,7 +598,7 @@ struct GUIDHashObject
|
|||
|
||||
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;
|
||||
};
|
||||
|
|
|
@ -1833,15 +1833,15 @@ static void setupMenuCustomizationHelper(QMenu* parentMenu, QList<QAction*> & st
|
|||
|
||||
void MainWindow::setupMenuCustomization()
|
||||
{
|
||||
mFileMenuStrings.append(reinterpret_cast<QAction*>("File"));
|
||||
mFileMenuStrings.append(reinterpret_cast<QAction* const&>("File"));
|
||||
setupMenuCustomizationHelper(ui->menuFile, mFileMenuStrings);
|
||||
mDebugMenuStrings.append(reinterpret_cast<QAction*>("Debug"));
|
||||
mDebugMenuStrings.append(reinterpret_cast<QAction* const&>("Debug"));
|
||||
setupMenuCustomizationHelper(ui->menuDebug, mDebugMenuStrings);
|
||||
mOptionsMenuStrings.append(reinterpret_cast<QAction*>("Option"));
|
||||
mOptionsMenuStrings.append(reinterpret_cast<QAction* const&>("Option"));
|
||||
setupMenuCustomizationHelper(ui->menuOptions, mOptionsMenuStrings);
|
||||
mHelpMenuStrings.append(reinterpret_cast<QAction*>("Help"));
|
||||
mHelpMenuStrings.append(reinterpret_cast<QAction* const&>("Help"));
|
||||
setupMenuCustomizationHelper(ui->menuHelp, mHelpMenuStrings);
|
||||
mViewMenuStrings.append(reinterpret_cast<QAction*>("View"));
|
||||
mViewMenuStrings.append(reinterpret_cast<QAction* const&>("View"));
|
||||
setupMenuCustomizationHelper(ui->menuView, mViewMenuStrings);
|
||||
onMenuCustomized();
|
||||
Config()->registerMainMenuStringList(&mFileMenuStrings);
|
||||
|
|
Loading…
Reference in New Issue