<div dir="ltr">What's this ambiguous with? (I know unique_ptr shows up as ambiguous between llvm:: and std:: on MSVC because MSVC provides std::make_unique unconditionally even in older language modes, etc - but not sure what would be providing something named 'Optional')</div><br><div class="gmail_quote"><div dir="ltr">On Wed, Jun 13, 2018 at 1:33 AM Pavel Labath 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: labath<br>
Date: Wed Jun 13 01:29:19 2018<br>
New Revision: 334580<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=334580&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=334580&view=rev</a><br>
Log:<br>
Fix "Optional" is ambiguous error on some bots<br>
<br>
Modified:<br>
    llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp?rev=334580&r1=334579&r2=334580&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp?rev=334580&r1=334579&r2=334580&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp (original)<br>
+++ llvm/trunk/tools/llvm-dwarfdump/llvm-dwarfdump.cpp Wed Jun 13 01:29:19 2018<br>
@@ -330,7 +330,7 @@ static DWARFDie toDie(const DWARFDebugNa<br>
   if (!CU)<br>
     return DWARFDie();<br>
<br>
-  if (Optional<uint64_t> DWOId = CU->getDWOId()) {<br>
+  if (llvm::Optional<uint64_t> DWOId = CU->getDWOId()) {<br>
     // This is a skeleton unit. Look up the DIE in the DWO unit.<br>
     CU = DICtx.getDWOCompileUnitForHash(*DWOId);<br>
     if (!CU)<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>