Even more fixes of implicit std::string conversions

llvm · Jan 30, 2020 · 635fbcd · 635fbcd
1 parent eb05457
commit 635fbcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clang-tools-extra/clangd/unittests/ClangdTests.cpp b/clang-tools-extra/clangd/unittests/ClangdTests.cpp
@@ -97,7 +97,7 @@ class MultipleErrorCheckingCallbacks : public ClangdServer::Callbacks {
     std::vector<std::pair<Path, bool>> Result;
     std::lock_guard<std::mutex> Lock(Mutex);
     for (const auto &It : LastDiagsHadError)
-      Result.emplace_back(It.first(), It.second);
+      Result.emplace_back(std::string(It.first()), It.second);
     return Result;
   }
 

diff --git a/clang-tools-extra/clangd/unittests/IndexActionTests.cpp b/clang-tools-extra/clangd/unittests/IndexActionTests.cpp
@@ -59,7 +59,7 @@ void checkNodesAreInitialized(const IndexFileIn &IndexFile,
 std::map<std::string, const IncludeGraphNode &> toMap(const IncludeGraph &IG) {
   std::map<std::string, const IncludeGraphNode &> Nodes;
   for (auto &I : IG)
-    Nodes.emplace(I.getKey(), I.getValue());
+    Nodes.emplace(std::string(I.getKey()), I.getValue());
   return Nodes;
 }