[clang] 00d834e - Fix more implicit conversions

[Jonas Devlieghere via cfe-commits]

Author: Jonas Devlieghere
Date: 2020-01-28T15:19:27-08:00
New Revision: 00d834e08719c994f12b216c7eb17bbc0c976714

URL: https://github.com/llvm/llvm-project/commit/00d834e08719c994f12b216c7eb17bbc0c976714
DIFF: https://github.com/llvm/llvm-project/commit/00d834e08719c994f12b216c7eb17bbc0c976714.diff

LOG: Fix more implicit conversions

Added: 
    

Modified: 
    clang/lib/DirectoryWatcher/mac/DirectoryWatcher-mac.cpp
    llvm/tools/dsymutil/SymbolMap.cpp

Removed: 
    


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

diff  --git a/llvm/tools/dsymutil/SymbolMap.cpp b/llvm/tools/dsymutil/SymbolMap.cpp
index 7ee078cd9f93..6a13efdf8e95 100644
--- a/llvm/tools/dsymutil/SymbolMap.cpp
+++ b/llvm/tools/dsymutil/SymbolMap.cpp
@@ -96,7 +96,7 @@ SymbolMapTranslator SymbolMapLoader::Load(StringRef InputFile,
           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);
       }