<div dir="ltr">Yay :-)</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 24, 2014 at 7:17 PM, Nico Weber <span dir="ltr"><<a href="mailto:nicolasweber@gmx.de" target="_blank">nicolasweber@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: nico<br>
Date: Wed Sep 24 12:17:32 2014<br>
New Revision: 218392<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=218392&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=218392&view=rev</a><br>
Log:<br>
clang-format: Don't let -style=Chromium imply c++03 template formatting.<br>
<br>
Chromium's now using some c++11 language features, so it's now fine that<br>
clang-format produces vector<vector<int>>.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/Format.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/Format.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=218392&r1=218391&r2=218392&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=218392&r1=218391&r2=218392&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Wed Sep 24 12:17:32 2014<br>
@@ -430,7 +430,6 @@ FormatStyle getChromiumStyle(FormatStyle<br>
   ChromiumStyle.AllowShortLoopsOnASingleLine = false;<br>
   ChromiumStyle.BinPackParameters = false;<br>
   ChromiumStyle.DerivePointerAlignment = false;<br>
-  ChromiumStyle.Standard = FormatStyle::LS_Cpp03;<br>
   return ChromiumStyle;<br>
 }<br>
<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=218392&r1=218391&r2=218392&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=218392&r1=218391&r2=218392&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Sep 24 12:17:32 2014<br>
@@ -4672,6 +4672,8 @@ TEST_F(FormatTest, UnderstandsTemplatePa<br>
   EXPECT_EQ("A<::A<int>> a;", format("A< ::A<int>> a;", getGoogleStyle()));<br>
   EXPECT_EQ("A<::A<int>> a;", format("A<::A<int> > a;", getGoogleStyle()));<br>
<br>
+  verifyFormat("A<A>> a;", getChromiumStyle(FormatStyle::LK_Cpp));<br>
+<br>
   verifyFormat("test >> a >> b;");<br>
   verifyFormat("test << a >> b;");<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>