<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 10, 2017 at 10:01 AM Zachary Turner via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: zturner<br>
Date: Mon Jul 10 10:01:28 2017<br>
New Revision: 307556<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=307556&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=307556&view=rev</a><br>
Log:<br>
Build fixes for pdb-diff test.<br>
<br>
Modified:<br>
    llvm/trunk/tools/llvm-pdbutil/Diff.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-pdbutil/Diff.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/Diff.cpp?rev=307556&r1=307555&r2=307556&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbutil/Diff.cpp?rev=307556&r1=307555&r2=307556&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-pdbutil/Diff.cpp (original)<br>
+++ llvm/trunk/tools/llvm-pdbutil/Diff.cpp Mon Jul 10 10:01:28 2017<br>
@@ -101,8 +101,8 @@ struct BinaryPathProvider {<br>
<br>
   SmallString<64> removeRoot(StringRef Path, bool IsRight) const {<br>
     SmallString<64> Native(Path);<br>
-    SmallString<64> Root =<br>
-        IsRight ? opts::diff::RightRoot : opts::diff::LeftRoot;<br>
+    auto &RootOpt = IsRight ? opts::diff::RightRoot : opts::diff::LeftRoot;<br>
+    SmallString<64> Root(static_cast<std::string>(RootOpt));<br>
     // pdb paths always use windows syntax, convert slashes to backslashes.<br>
     sys::path::native(Root, sys::path::Style::windows);<br>
     if (sys::path::has_stem(Root, sys::path::Style::windows))<br>
@@ -449,7 +449,7 @@ diffOneModule(DiffPrinter &D,<br>
<br>
   BinaryPathProvider PathProvider(28);<br>
   auto Iter = llvm::find_if(<br>
-      Other, [&Item, &PathProvider, ItemIsRight,<br>
+      Other, [&PathProvider, ItemIsRight,<br>
               L](const std::pair<uint32_t, DbiModuleDescriptor> &Other) {<br></blockquote><div><br></div><div>For lambdas used locally, I'd generally favor the use of default capture [&] - it doesn't seem important to name exactly which things are being captured, etc. (treating local/immediately used lambdas more like scopes -it's not important to know which outer variables are used within a 'for' loop scope, so why would it be important for a lambda?)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
         const auto *Left = L;<br>
         const auto *Right = &Other;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>