From 5002236cb683520841a8a57a5d618d997bbd6ec6 Mon Sep 17 00:00:00 2001
From: Yu <l1nxy.zy@gmail.com>
Date: Thu, 7 Jan 2021 12:32:42 +0800
Subject: [PATCH] Make llvm::StringRef to std::string conversions explicit.

---
 src/clang_tu.cc           | 2 +-
 src/messages/workspace.cc | 2 +-
 src/project.cc            | 2 +-
 src/sema_manager.cc       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/clang_tu.cc b/src/clang_tu.cc
index 9e026652..ea470dca 100644
--- a/src/clang_tu.cc
+++ b/src/clang_tu.cc
@@ -25,7 +25,7 @@ std::string pathFromFileEntry(const FileEntry &file) {
     // Resolve symlinks outside of working folders. This handles leading path
     // components, e.g. (/lib -> /usr/lib) in
     // /../lib/gcc/x86_64-linux-gnu/10/../../../../include/c++/10/utility
-    ret = file.tryGetRealPathName();
+    ret = std::string(file.tryGetRealPathName());
   } else {
     // If getName() refers to a file within a workspace folder, we prefer it
     // (which may be a symlink).
diff --git a/src/messages/workspace.cc b/src/messages/workspace.cc
index c604ab62..9e3e6070 100644
--- a/src/messages/workspace.cc
+++ b/src/messages/workspace.cc
@@ -38,7 +38,7 @@ void MessageHandler::workspace_didChangeWatchedFiles(
          StringRef(path).startswith(g_config->cache.directory)) ||
         lookupExtension(path).first == LanguageId::Unknown)
       return;
-    for (std::string cur = path; cur.size(); cur = sys::path::parent_path(cur))
+    for (std::string cur = path; cur.size(); cur = std::string(sys::path::parent_path(cur)))
       if (cur[0] == '.')
         return;
 
diff --git a/src/project.cc b/src/project.cc
index c02bd6b6..3e9221bc 100644
--- a/src/project.cc
+++ b/src/project.cc
@@ -251,7 +251,7 @@ void loadDirectoryListing(ProjectProcessor &proc, const std::string &root,
   std::vector<std::string> files;
 
   auto getDotCcls = [&root, &folder](std::string cur) {
-    while (!(cur = sys::path::parent_path(cur)).empty()) {
+    while (!(cur = std::string(sys::path::parent_path(cur))).empty()) {
       auto it = folder.dot_ccls.find(cur + '/');
       if (it != folder.dot_ccls.end())
         return it->second;
diff --git a/src/sema_manager.cc b/src/sema_manager.cc
index f597395c..ebe8c8f4 100644
--- a/src/sema_manager.cc
+++ b/src/sema_manager.cc
@@ -249,9 +249,9 @@ public:
       info.FormatDiagnostic(message);
       d.range =
           fromCharSourceRange(sm, *langOpts, diagnosticRange(info, *langOpts));
-      d.message = message.str();
+      d.message = std::string(message.str());
       d.concerned = concerned;
-      d.file = filename;
+      d.file = std::string(filename);
       d.level = level;
       d.category = DiagnosticIDs::getCategoryNumberForDiag(info.getID());
     };