<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); font-family: Calibri, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;" dir="ltr">
<p style="margin-top:0;margin-bottom:0">Can this still be merged into the release please?</p>
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<p style="margin-top:0;margin-bottom:0">Thank you!</p>
<p style="margin-top:0;margin-bottom:0">Anastasia<br>
</p>
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<br>
<div style="color: rgb(0, 0, 0);">
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b> cfe-commits <cfe-commits-bounces@lists.llvm.org> on behalf of Anastasia Stulova via cfe-commits <cfe-commits@lists.llvm.org><br>
<b>Sent:</b> 23 August 2019 18:10<br>
<b>To:</b> cfe-commits@lists.llvm.org <cfe-commits@lists.llvm.org><br>
<b>Subject:</b> r369779 - [OpenCL] Renamed value of std flag in C++ mode.</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Author: stulova<br>
Date: Fri Aug 23 10:10:33 2019<br>
New Revision: 369779<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=369779&view=rev">http://llvm.org/viewvc/llvm-project?rev=369779&view=rev</a><br>
Log:<br>
[OpenCL] Renamed value of std flag in C++ mode.<br>
<br>
Clang should accept -std=clc++ (not -std=c++!) for OpenCL.<br>
<br>
This was forgotten in r367008.<br>
<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/LangStandards.def<br>
cfe/trunk/test/Driver/unknown-std.cl<br>
<br>
Modified: cfe/trunk/include/clang/Basic/LangStandards.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LangStandards.def?rev=369779&r1=369778&r2=369779&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LangStandards.def?rev=369779&r1=369778&r2=369779&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/LangStandards.def (original)<br>
+++ cfe/trunk/include/clang/Basic/LangStandards.def Fri Aug 23 10:10:33 2019<br>
@@ -165,7 +165,7 @@ LANGSTANDARD(opencl12, "cl1.2",<br>
LANGSTANDARD(opencl20, "cl2.0",<br>
OpenCL, "OpenCL 2.0",<br>
LineComment | C99 | Digraphs | HexFloat | OpenCL)<br>
-LANGSTANDARD(openclcpp, "c++",<br>
+LANGSTANDARD(openclcpp, "clc++",<br>
OpenCL, "C++ for OpenCL",<br>
LineComment | CPlusPlus | CPlusPlus11 | CPlusPlus14 | CPlusPlus17 |<br>
Digraphs | HexFloat | OpenCL)<br>
<br>
Modified: cfe/trunk/test/Driver/unknown-std.cl<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/unknown-std.cl?rev=369779&r1=369778&r2=369779&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/unknown-std.cl?rev=369779&r1=369778&r2=369779&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/unknown-std.cl (original)<br>
+++ cfe/trunk/test/Driver/unknown-std.cl Fri Aug 23 10:10:33 2019<br>
@@ -10,7 +10,7 @@<br>
// CHECK-NEXT: note: use 'cl1.1' for 'OpenCL 1.1' standard<br>
// CHECK-NEXT: note: use 'cl1.2' for 'OpenCL 1.2' standard<br>
// CHECK-NEXT: note: use 'cl2.0' for 'OpenCL 2.0' standard<br>
-// CHECK-NEXT: note: use 'c++' for 'C++ for OpenCL' standard<br>
+// CHECK-NEXT: note: use 'clc++' for 'C++ for OpenCL' standard<br>
<br>
// Make sure that no other output is present.<br>
// CHECK-NOT: {{^.+$}}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
cfe-commits@lists.llvm.org<br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div>
</span></font></div>
</div>
</div>
</body>
</html>