* Eliminate warnings such as ...
`warning C4238: nonstandard extension used: class rvalue used as
lvalue`
* These are warnings that only occur with Warning Level == 4.
bool bDone = MultiStepCompressArchive(pathIntermediate);\r
if (bDone)\r
{\r
- piHandler->CompressArchive(hwndOwner, path,\r
- &SingleItemEnumerator(path, pathIntermediate));\r
+ SingleItemEnumerator tmpEnumerator(path, pathIntermediate);\r
+ piHandler->CompressArchive(hwndOwner, path, &tmpEnumerator);\r
DeleteFile(pathIntermediate);\r
}\r
else\r
(strDesc && !strDesc[0].empty()) ? strDesc[0] : _("Theirs File"),
(strDesc && !strDesc[2].empty()) ? strDesc[2] : _("Mine File") };
DWORD dwFlags[2] = {FFILEOPEN_READONLY | FFILEOPEN_NOMRU, FFILEOPEN_NOMRU | FFILEOPEN_MODIFIED};
- conflictCompared = DoFileOpen(&PathContext(revFile, workFile),
- dwFlags, strDesc2);
+ PathContext tmpPathContext(revFile, workFile);
+ conflictCompared = DoFileOpen(&tmpPathContext, dwFlags, strDesc2);
}
else
{
(strDesc && !strDesc[0].empty()) ? strDesc[0] : _("Base File"),
(strDesc && !strDesc[1].empty()) ? strDesc[1] : _("Theirs File"),
(strDesc && !strDesc[2].empty()) ? strDesc[2] : _("Mine File") };
+ PathContext tmpPathContext(baseFile, revFile, workFile);
DWORD dwFlags[3] = {FFILEOPEN_READONLY | FFILEOPEN_NOMRU, FFILEOPEN_READONLY | FFILEOPEN_NOMRU, FFILEOPEN_NOMRU | FFILEOPEN_MODIFIED};
- conflictCompared = DoFileOpen(&PathContext(baseFile, revFile, workFile),
- dwFlags, strDesc3);
+ conflictCompared = DoFileOpen(&tmpPathContext, dwFlags, strDesc3);
}
}
else
if (GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_OK))
GetParentFrame()->PostMessage(WM_CLOSE);
+ PathContext tmpPathContext(pDoc->m_files);
+ PackingInfo tmpPackingInfo(pDoc->m_infoHandler);
GetMainFrame()->DoFileOpen(
- &PathContext(pDoc->m_files), std::array<DWORD, 3>(pDoc->m_dwFlags).data(),
- NULL, _T(""), !!pDoc->m_bRecurse, NULL, _T(""), &PackingInfo(pDoc->m_infoHandler));
+ &tmpPathContext, std::array<DWORD, 3>(pDoc->m_dwFlags).data(),
+ NULL, _T(""), !!pDoc->m_bRecurse, NULL, _T(""), &tmpPackingInfo);
}
/**