commit 00d834e08719c994f12b216c7eb17bbc0c976714
author Jonas Devlieghere <jonas@devlieghere.com> Tue Jan 28 15:19:17 2020 -0800
committer Jonas Devlieghere <jonas@devlieghere.com> Tue Jan 28 15:19:27 2020 -0800
tree 6e6d143d4cc7e75bc6cb0a9a69b9ff6ec7d5ec88
parent a153d78c7eb079bcba5ebb37fc1ab9b3c82b99a4

Fix more implicit conversions

clang/lib/DirectoryWatcher/mac/DirectoryWatcher-mac.cpp

diff --git a/clang/lib/DirectoryWatcher/mac/DirectoryWatcher-mac.cpp b/clang/lib/DirectoryWatcher/mac/DirectoryWatcher-mac.cpp
index 7a60369..88bab18 100644
--- a/clang/lib/DirectoryWatcher/mac/DirectoryWatcher-mac.cpp
+++ b/clang/lib/DirectoryWatcher/mac/DirectoryWatcher-mac.cpp
@@ -173,7 +173,7 @@
       if (::realpath(P.begin(), Buffer) != nullptr)
         RealPath = Buffer;
       else
-        RealPath = Path;
+        RealPath = Path.str();
     }
 
     FSEventStreamContext Context;

llvm/tools/dsymutil/SymbolMap.cpp

diff --git a/llvm/tools/dsymutil/SymbolMap.cpp b/llvm/tools/dsymutil/SymbolMap.cpp
index 7ee078c..6a13efd 100644
--- a/llvm/tools/dsymutil/SymbolMap.cpp
+++ b/llvm/tools/dsymutil/SymbolMap.cpp
@@ -96,7 +96,7 @@
           StringRef UUID(CFStringGetCStringPtr(OldUUID, kCFStringEncodingUTF8));
           SmallString<256> BCSymbolMapPath(SymbolMapPath);
           sys::path::append(BCSymbolMapPath, UUID.str() + ".bcsymbolmap");
-          SymbolMapPath = BCSymbolMapPath.str();
+          SymbolMapPath = BCSymbolMapPath.str().str();
         }
         CFRelease(plist);
       }