ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5675 from Tilka/warning 

Fix two warnings
This commit is contained in:
Mat M 2017-06-23 20:46:32 -04:00 committed by GitHub
parent ced53e2920 c8255092d7
commit 4320c641f7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/FileSearch.cpp
View File

@ -45,8 +45,9 @@ FileSearchWithTest(const std::vector<std::string>& directories, bool recursive,
return result;
}
std::vector<std::string> DoFileSearchNoSTL(const std::vector<std::string>& directories,
const std::vector<std::string>& exts, bool recursive)
static std::vector<std::string> DoFileSearchNoSTL(const std::vector<std::string>& directories,
const std::vector<std::string>& exts,
bool recursive)
{
bool accept_all = exts.empty();
return FileSearchWithTest(directories, recursive, [&](const File::FSTEntry& entry) {

6
Source/Core/DolphinWX/ISOProperties/FilesystemPanel.cpp
View File

@ -399,9 +399,9 @@ void FilesystemPanel::ExtractSingleDirectory(const wxString& output_folder)
}
}
void ExtractDir(const std::string& full_path, const std::string& output_folder,
const DiscIO::FileSystem& file_system, const DiscIO::FileInfo& directory,
const std::function<bool(const std::string& path)>& update_progress)
static void ExtractDir(const std::string& full_path, const std::string& output_folder,
const DiscIO::FileSystem& file_system, const DiscIO::FileInfo& directory,
const std::function<bool(const std::string& path)>& update_progress)
{
for (const DiscIO::FileInfo& file_info : directory)
{