diff options
| author |  LC | 2020-10-20 22:08:53 -0400 |
|---|---|---|
| committer |  GitHub | 2020-10-20 22:08:53 -0400 |
| commit | 2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch) | |
| tree | 0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/common/file_util.h | |
| parent | kernel: Fix build with recent compiler flag changes (diff) | |
| parent | Revert "core: Fix clang build" (diff) | |
| download | yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.gz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.xz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.zip | |
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/common/file_util.h')
| -rw-r--r-- | src/common/file_util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h index 508b7a10a..8b587320f 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h | |||
| @@ -189,8 +189,7 @@ template <typename T> | |||
| 189 | return {}; | 189 | return {}; |
| 190 | } | 190 | } |
| 191 | last = std::min<std::size_t>(last, vector.size()); | 191 | last = std::min<std::size_t>(last, vector.size()); |
| 192 | return std::vector<T>(vector.begin() + static_cast<std::ptrdiff_t>(first), | 192 | return std::vector<T>(vector.begin() + first, vector.begin() + first + last); |
| 193 | vector.begin() + static_cast<std::ptrdiff_t>(first + last)); | ||
| 194 | } | 193 | } |
| 195 | 194 | ||
| 196 | enum class DirectorySeparator { | 195 | enum class DirectorySeparator { |