Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-22 16:39:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix clang 3.5 compile error

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-31 21:49:56 -08:00
parent c98d53cfe2
commit e0e3a39d5d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/import_pipeline.cc
View File

@ -286,10 +286,10 @@ std::vector<FileContents> PreloadFileContents(
// index->file_contents comes from cache, so we need to check if that cache is // index->file_contents comes from cache, so we need to check if that cache is
// still valid. if so, we can use it, otherwise we need to load from disk. // still valid. if so, we can use it, otherwise we need to load from disk.
auto get_latest_content = [](const std::string& path, int64_t cached_time, auto get_latest_content = [](const std::string& path, int64_t cached_time,
const std::string& cached) { const std::string& cached) -> std::string {
optional<int64_t> mod_time = GetLastModificationTime(path); optional<int64_t> mod_time = GetLastModificationTime(path);
if (!mod_time) if (!mod_time)
return std::string(""); return "";
if (*mod_time == cached_time) if (*mod_time == cached_time)
return cached; return cached;
@ -297,7 +297,7 @@ std::vector<FileContents> PreloadFileContents(
optional<std::string> fresh_content = ReadContent(path); optional<std::string> fresh_content = ReadContent(path);
if (!fresh_content) { if (!fresh_content) {
LOG_S(ERROR) << "Failed to load content for " << path; LOG_S(ERROR) << "Failed to load content for " << path;
return std::string(""); return "";
} }
return *fresh_content; return *fresh_content;
}; };