diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-22 03:50:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 03:50:38 +0200 |
| commit | 53a219f163941988826aec4496a61ec36c69ce7d (patch) | |
| tree | bb42901196f8f8cf5d5adc29aa71890c8b50ba63 | |
| parent | Merge pull request #748 from lioncash/namespace (diff) | |
| parent | file_util: Remove explicit type from std::min() in GetPathWithoutTop() (diff) | |
| download | yuzu-53a219f163941988826aec4496a61ec36c69ce7d.tar yuzu-53a219f163941988826aec4496a61ec36c69ce7d.tar.gz yuzu-53a219f163941988826aec4496a61ec36c69ce7d.tar.bz2 yuzu-53a219f163941988826aec4496a61ec36c69ce7d.tar.lz yuzu-53a219f163941988826aec4496a61ec36c69ce7d.tar.xz yuzu-53a219f163941988826aec4496a61ec36c69ce7d.tar.zst yuzu-53a219f163941988826aec4496a61ec36c69ce7d.zip | |
| -rw-r--r-- | src/common/file_util.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 1e28f7cbb..d8163a4a8 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -838,8 +838,7 @@ std::string GetPathWithoutTop(std::string path) { } const auto name_bck_index = path.find_first_of('\\'); const auto name_fwd_index = path.find_first_of('/'); - return path.substr(std::min<size_t>(name_bck_index, name_fwd_index) + 1); - return path.substr(std::min<size_t>(name_bck_index, name_fwd_index) + 1); + return path.substr(std::min(name_bck_index, name_fwd_index) + 1); } std::string GetFilename(std::string path) { |