<div dir="ltr">gtest has this define that's supposed to prevent this. You have to trace through several layers of macros but it should be used by <span style="font-size:12.8px">EXPECT_EQ</span><div><br></div><div><div>#ifdef __INTEL_COMPILER</div><div># define GTEST_AMBIGUOUS_ELSE_BLOCKER_</div><div>#else</div><div># define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default: // NOLINT</div><div>#endif</div></div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature">~Craig</div></div>
<br><div class="gmail_quote">On Sat, May 27, 2017 at 10:07 PM, Galina Kistanova via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I did not want to fix googletest at this point. But if I'll end up doing so, I'll fix this one too.<br><br></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Sat, May 27, 2017 at 9:39 PM, Davide Italiano <span dir="ltr"><<a href="mailto:davide@freebsd.org" target="_blank">davide@freebsd.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="m_-1125979373852401862HOEnZb"><div class="m_-1125979373852401862h5">On Sat, May 27, 2017 at 8:50 PM, Galina Kistanova via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: gkistanova<br>
> Date: Sat May 27 22:50:52 2017<br>
> New Revision: 304083<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=304083&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=304083&view=rev</a><br>
> Log:<br>
> Added braces to address gcc warning: suggest explicit braces to avoid ambiguous 'else' [-Wdangling-else]. NFC.<br>
><br>
> Modified:<br>
> llvm/trunk/unittests/Support/<wbr>CommandLineTest.cpp<br>
><br>
> Modified: llvm/trunk/unittests/Support/C<wbr>ommandLineTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CommandLineTest.cpp?rev=304083&r1=304082&r2=304083&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/unittests/Sup<wbr>port/CommandLineTest.cpp?rev=<wbr>304083&r1=304082&r2=304083&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/unittests/Support/C<wbr>ommandLineTest.cpp (original)<br>
> +++ llvm/trunk/unittests/Support/C<wbr>ommandLineTest.cpp Sat May 27 22:50:52 2017<br>
> @@ -180,8 +180,9 @@ void testCommandLineTokenizer(Parse<wbr>rFunc<br>
> parse(Input, Saver, Actual, /*MarkEOLs=*/false);<br>
> EXPECT_EQ(OutputSize, Actual.size());<br>
> for (unsigned I = 0, E = Actual.size(); I != E; ++I) {<br>
> - if (I < OutputSize)<br>
> + if (I < OutputSize) {<br>
> EXPECT_STREQ(Output[I], Actual[I]);<br>
> + }<br>
> }<br>
> }<br>
><br>
> @@ -528,8 +529,9 @@ TEST(CommandLineTest, GetRegisteredSubco<br>
> EXPECT_FALSE(Opt1);<br>
> EXPECT_FALSE(Opt2);<br>
> for (auto *S : cl::getRegisteredSubcommands()<wbr>) {<br>
> - if (*S)<br>
> + if (*S) {<br>
> EXPECT_EQ("sc1", S->getName());<br>
> + }<br>
> }<br>
><br>
> cl::ResetAllOptionOccurrences(<wbr>);<br>
> @@ -538,8 +540,9 @@ TEST(CommandLineTest, GetRegisteredSubco<br>
> EXPECT_FALSE(Opt1);<br>
> EXPECT_FALSE(Opt2);<br>
> for (auto *S : cl::getRegisteredSubcommands()<wbr>) {<br>
> - if (*S)<br>
> + if (*S) {<br>
> EXPECT_EQ("sc2", S->getName());<br>
> + }<br>
> }<br>
> }<br>
><br>
<br>
</div></div>I'm confused. Where's the else here ? :)<br>
Is EXPECT_EQ a macro that gets expanded to something? If so, maybe you<br>
should consider fixing it there instead of all the uses?<br>
<br>
Thanks!<br>
<span class="m_-1125979373852401862HOEnZb"><font color="#888888"><br>
--<br>
Davide<br>
<br>
"There are no solved problems; there are only problems that are more<br>
or less solved" -- Henri Poincare<br>
</font></span></blockquote></div><br></div>
</div></div><br>______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">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/<wbr>mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br></div>