Commit e28d8f90 authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[lldb] Replace SmallStr.str().str() with std::string conversion operator. 

Use the std::string conversion operator introduced in
d7049213. The SmallString in the log
statement doesn't require conversion at all when using the variadic log
macro.
parent 1ef8e8b4

lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp

+4 −4
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ static bool DefaultComputeClangResourceDirectory(FileSpec &lldb_shlib_spec, 
    llvm::sys::path::native(relative_path);

    llvm::sys::path::append(clang_dir, relative_path);

    if (!verify || VerifyClangPath(clang_dir)) {

      LLDB_LOGF(log,

      LLDB_LOG(log,

               "DefaultComputeClangResourceDir: Setting ClangResourceDir "

                "to \"%s\", verify = %s",

                clang_dir.str().str().c_str(), verify ? "true" : "false");

               "to \"{0}\", verify = {1}",

               clang_dir.str(), verify ? "true" : "false");

      file_spec.GetDirectory().SetString(clang_dir);

      FileSystem::Instance().Resolve(file_spec);

      return true;

lldb/unittests/Expression/CppModuleConfigurationTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static std::string ResourceInc() { 
  llvm::SmallString<256> resource_dir;

  llvm::sys::path::append(resource_dir, GetClangResourceDir().GetPath(),

                          "include");

  return resource_dir.str().str();

  return std::string(resource_dir);

}



/// Utility function turningn a list of paths into a FileSpecList.