Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-19 17:40:15 +02:00
Code Issues Releases Wiki Activity

Fix warnings for ambiguous else

Browse Source
This commit is contained in:
Paul Licameli 2016-02-26 14:41:45 -05:00
parent 60bcd7aea2
commit 1398d1a953
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/DirManager.cpp
View File

@ -583,7 +583,9 @@ wxFileName DirManager::MakeBlockFilePath(const wxString &value) {
dir.AppendDir(middir); dir.AppendDir(middir);
if(!dir.DirExists() && !dir.Mkdir(0777,wxPATH_MKDIR_FULL)) if(!dir.DirExists() && !dir.Mkdir(0777,wxPATH_MKDIR_FULL))
{ // need braces to avoid compiler warning about ambiguous else, see the macro
wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed.")); wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed."));
}
} }
return dir; return dir;
} }
@ -1219,8 +1221,10 @@ bool DirManager::EnsureSafeFilename(wxFileName fName)
wxFile testFile(renamedFileName.GetFullPath(), wxFile::write); wxFile testFile(renamedFileName.GetFullPath(), wxFile::write);
if (!testFile.IsOpened()) { if (!testFile.IsOpened()) {
wxLogSysError(_("Unable to open/create test file."), { // need braces to avoid compiler warning about ambiguous else, see the macro
wxLogSysError(_("Unable to open/create test file."),
renamedFileName.GetFullPath().c_str()); renamedFileName.GetFullPath().c_str());
}
return false; return false;
} }
@ -1229,8 +1233,10 @@ bool DirManager::EnsureSafeFilename(wxFileName fName)
if (!wxRemoveFile(renamedFileName.GetFullPath())) { if (!wxRemoveFile(renamedFileName.GetFullPath())) {
/* i18n-hint: %s is the name of a file.*/ /* i18n-hint: %s is the name of a file.*/
wxLogSysError(_("Unable to remove '%s'."), { // need braces to avoid compiler warning about ambiguous else, see the macro
wxLogSysError(_("Unable to remove '%s'."),
renamedFileName.GetFullPath().c_str()); renamedFileName.GetFullPath().c_str());
}
return false; return false;
} }