Merge remote-tracking branch 'citra/master' into fmtlib-macros

2018-03-16 20:50:52 +08:00
parent 327901e145 935bcdbd20
commit b5532babab
175 changed files with 22962 additions and 2105 deletions
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@ -94,4 +94,4 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin,
 bool Filter::CheckMessage(Class log_class, Level level) const {
    return static_cast<u8>(level) >= static_cast<u8>(class_levels[static_cast<size_t>(log_class)]);
 }
-}
+} // namespace Log