diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-08-14 23:18:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 23:18:04 +0800 |
| commit | 5bfd00f4e6a3e0bc7d53488287112a2e04f7d696 (patch) | |
| tree | 17d46158f6357e31b1b9e43e2d08d790c5886453 /Source/Core | |
| parent | fc9f9b6683cad155ad7020eb04db68a7685741ae (diff) | |
| parent | 1ade08c607292f97963a175d379c5b34a5ae589a (diff) | |
Merge pull request #5926 from ligfx/lintallsource
Fix two small lint errors
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Assert.h | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/NANDContentLoader.h | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/Common/Assert.h b/Source/Core/Common/Assert.h index a1cd78d8d6..aecfbdd6d1 100644 --- a/Source/Core/Common/Assert.h +++ b/Source/Core/Common/Assert.h @@ -13,7 +13,7 @@ #define _assert_msg_(_t_, _a_, _fmt_, ...) \ if (!(_a_)) \ { \ - if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__)) \ + if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__)) \ Crash(); \ } diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h index 3b3d36ee70..aa7d1c168e 100644 --- a/Source/Core/DiscIO/NANDContentLoader.h +++ b/Source/Core/DiscIO/NANDContentLoader.h @@ -108,11 +108,10 @@ public: return instance; } - const NANDContentLoader& - GetNANDLoader(const std::string& content_path, - Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT); - const NANDContentLoader& - GetNANDLoader(u64 title_id, Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT); + const NANDContentLoader& GetNANDLoader(const std::string& content_path, + Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT); + const NANDContentLoader& GetNANDLoader(u64 title_id, + Common::FromWhichRoot from = Common::FROM_CONFIGURED_ROOT); void ClearCache(); private: |
