]> granicus.if.org Git - clang/commitdiff
Simplify code with the in place path::native. No functionality change.
authorBenjamin Kramer <benny.kra@googlemail.com>
Wed, 11 Sep 2013 11:23:15 +0000 (11:23 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Wed, 11 Sep 2013 11:23:15 +0000 (11:23 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190515 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/ModuleMap.cpp
lib/Tooling/Tooling.cpp

index b2698b1877d657d0971639412956c7d3d0d647aa..df80a93e4db84d66df2d346feae96836900eb4d4 100644 (file)
@@ -541,11 +541,9 @@ ModuleMap::inferFrameworkModule(StringRef ModuleName,
   SmallString<128> SubframeworksDirName
     = StringRef(FrameworkDir->getName());
   llvm::sys::path::append(SubframeworksDirName, "Frameworks");
-  SmallString<128> SubframeworksDirNameNative;
-  llvm::sys::path::native(SubframeworksDirName.str(),
-                          SubframeworksDirNameNative);
+  llvm::sys::path::native(SubframeworksDirName);
   for (llvm::sys::fs::directory_iterator 
-         Dir(SubframeworksDirNameNative.str(), EC), DirEnd;
+         Dir(SubframeworksDirName.str(), EC), DirEnd;
        Dir != DirEnd && !EC; Dir.increment(EC)) {
     if (!StringRef(Dir->path()).endswith(".framework"))
       continue;
index 6f7e7b6c1c485d53b41e6922d8d67c2ae6fee720..b420ba934d4ff3d9c32a42e69272048ecda8a9d1 100644 (file)
@@ -134,9 +134,8 @@ std::string getAbsolutePath(StringRef File) {
   llvm::error_code EC = llvm::sys::fs::make_absolute(AbsolutePath);
   assert(!EC);
   (void)EC;
-  SmallString<1024> PathStorage;
-  llvm::sys::path::native(Twine(AbsolutePath), PathStorage);
-  return PathStorage.str();
+  llvm::sys::path::native(AbsolutePath);
+  return AbsolutePath.str();
 }
 
 ToolInvocation::ToolInvocation(