[clang-tools-extra] r296458 - [change-namespace] trying to fix windows buildbot failure.

Eric Liu via cfe-commits cfe-commits at lists.llvm.org
Tue Feb 28 02:00:15 PST 2017


Author: ioeric
Date: Tue Feb 28 04:00:15 2017
New Revision: 296458

URL: http://llvm.org/viewvc/llvm-project?rev=296458&view=rev
Log:
[change-namespace] trying to fix windows buildbot failure.

Modified:
    clang-tools-extra/trunk/change-namespace/tool/ClangChangeNamespace.cpp

Modified: clang-tools-extra/trunk/change-namespace/tool/ClangChangeNamespace.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/change-namespace/tool/ClangChangeNamespace.cpp?rev=296458&r1=296457&r2=296458&view=diff
==============================================================================
--- clang-tools-extra/trunk/change-namespace/tool/ClangChangeNamespace.cpp (original)
+++ clang-tools-extra/trunk/change-namespace/tool/ClangChangeNamespace.cpp Tue Feb 28 04:00:15 2017
@@ -80,8 +80,9 @@ cl::opt<std::string> WhiteListFile(
     cl::init(""), cl::cat(ChangeNamespaceCategory));
 
 llvm::ErrorOr<std::vector<std::string>> GetWhiteListedSymbolPatterns() {
+  std::vector<std::string> Patterns;
   if (WhiteListFile.empty())
-    return std::vector<std::string>();
+    return Patterns;
 
   llvm::SmallVector<StringRef, 8> Lines;
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
@@ -90,7 +91,9 @@ llvm::ErrorOr<std::vector<std::string>>
     return File.getError();
   llvm::StringRef Content = File.get()->getBuffer();
   Content.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
-  return std::vector<std::string>(Lines.begin(), Lines.end());
+  for (auto Line : Lines)
+    Patterns.push_back(Line.trim());
+  return Patterns;
 }
 
 } // anonymous namespace




More information about the cfe-commits mailing list