From 41660c8923d15d634ccc98fd08199c9a78496320 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 21 Jul 2018 15:18:23 -0400 Subject: file_util: Remove redundant duplicate return in GetPathWithoutTop() --- src/common/file_util.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index c882ab39f..29dd16541 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -837,7 +837,6 @@ 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(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) { -- cgit v1.2.3 From 34d6a1349cc23b10b84ef289dca9825199d735c8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 21 Jul 2018 15:19:30 -0400 Subject: file_util: Remove explicit type from std::min() in GetPathWithoutTop() Given both operands are the same type, there won't be an issue with overload selection that requires making this explicit. --- src/common/file_util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 29dd16541..efcf58ca6 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -836,7 +836,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(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) { -- cgit v1.2.3