diff options
| author |  bunnei | 2020-04-21 14:11:18 -0400 |
|---|---|---|
| committer |  GitHub | 2020-04-21 14:11:18 -0400 |
| commit | 9bf3abcb63003e1f6cb911270a88cda761f63525 (patch) | |
| tree | c633d54ee61e75888ce227720d576b7c0d3cf7e5 /src/core/hle | |
| parent | Merge pull request #3724 from bunnei/fix-unicorn (diff) | |
| parent | key_manager: Resolve missing field initializer warning (diff) | |
| download | yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.gz yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.tar.xz yuzu-9bf3abcb63003e1f6cb911270a88cda761f63525.zip | |
Merge pull request #3698 from lioncash/warning
General: Resolve minor assorted warnings
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/time/time_zone_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp index c8159bcd5..69152d0ac 100644 --- a/src/core/hle/service/time/time_zone_manager.cpp +++ b/src/core/hle/service/time/time_zone_manager.cpp | |||
| @@ -518,8 +518,8 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi | |||
| 518 | constexpr s32 time_zone_max_leaps{50}; | 518 | constexpr s32 time_zone_max_leaps{50}; |
| 519 | constexpr s32 time_zone_max_chars{50}; | 519 | constexpr s32 time_zone_max_chars{50}; |
| 520 | if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps && | 520 | if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps && |
| 521 | 0 < header.type_count && header.type_count < time_zone_rule.ttis.size() && | 521 | 0 < header.type_count && header.type_count < s32(time_zone_rule.ttis.size()) && |
| 522 | 0 <= header.time_count && header.time_count < time_zone_rule.ats.size() && | 522 | 0 <= header.time_count && header.time_count < s32(time_zone_rule.ats.size()) && |
| 523 | 0 <= header.char_count && header.char_count < time_zone_max_chars && | 523 | 0 <= header.char_count && header.char_count < time_zone_max_chars && |
| 524 | (header.ttis_std_count == header.type_count || header.ttis_std_count == 0) && | 524 | (header.ttis_std_count == header.type_count || header.ttis_std_count == 0) && |
| 525 | (header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) { | 525 | (header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) { |