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 #5926 from ligfx/lintallsource 

Fix two small lint errors
This commit is contained in:
Leo Lam 2017-08-14 23:18:04 +08:00 committed by GitHub
parent fc9f9b6683 1ade08c607
commit 5bfd00f4e6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Assert.h
View File

@ -13,7 +13,7 @@
#define _assert_msg_(_t_, _a_, _fmt_, ...) \ #define _assert_msg_(_t_, _a_, _fmt_, ...) \
if (!(_a_)) \ if (!(_a_)) \
{ \ { \
if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__)) \ if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__)) \
Crash(); \ Crash(); \
} }

9
Source/Core/DiscIO/NANDContentLoader.h
View File

@ -108,11 +108,10 @@ public:
return instance; return instance;
} }
const NANDContentLoader& const NANDContentLoader& GetNANDLoader(const std::string& content_path,
GetNANDLoader(const std::string& content_path, Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT);
Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT); const NANDContentLoader& GetNANDLoader(u64 title_id,
const NANDContentLoader& Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT);
GetNANDLoader(u64 title_id, Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT);
void ClearCache(); void ClearCache();
private: private: