diff options
| author | B Stack <bgstack15@gmail.com> | 2020-10-02 14:42:30 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-10-02 14:42:30 -0400 |
| commit | 8aaf029ab6046eb8cbe600a548d176c1418bd99a (patch) | |
| tree | d8a89392817379e3036c42eedebf33d4fb372dfd /zen/file_access.cpp | |
| parent | Merge branch '11.1' into 'master' (diff) | |
| download | FreeFileSync-8aaf029ab6046eb8cbe600a548d176c1418bd99a.tar.gz FreeFileSync-8aaf029ab6046eb8cbe600a548d176c1418bd99a.tar.bz2 FreeFileSync-8aaf029ab6046eb8cbe600a548d176c1418bd99a.zip | |
add upstream 11.2
Diffstat (limited to 'zen/file_access.cpp')
| -rw-r--r-- | zen/file_access.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/file_access.cpp b/zen/file_access.cpp index 7d3fbfc5..3269bef4 100644 --- a/zen/file_access.cpp +++ b/zen/file_access.cpp @@ -82,7 +82,7 @@ std::optional<Zstring> zen::getParentFolderPath(const Zstring& itemPath) if (const std::optional<PathComponents> comp = parsePathComponents(itemPath)) { if (comp->relPath.empty()) - return {}; + return std::nullopt; const Zstring parentRelPath = beforeLast(comp->relPath, FILE_NAME_SEPARATOR, IfNotFoundReturn::none); if (parentRelPath.empty()) @@ -90,7 +90,7 @@ std::optional<Zstring> zen::getParentFolderPath(const Zstring& itemPath) return appendSeparator(comp->rootPath) + parentRelPath; } assert(false); - return {}; + return std::nullopt; } |