[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] languages/plugins/custom-definesandincludes: Fix list of available OpenCL C standards
From:       Aleix Pol <null () kde ! org>
Date:       2017-05-31 21:37:19
Message-ID: E1dGBIt-0000es-Ep () code ! kde ! org
[Download RAW message or body]

Git commit 4f555d7f3437a985e3b719319d947ca36c3d5a42 by Aleix Pol, on behalf of Aaron \
Puchert. Committed on 31/05/2017 at 21:35.
Pushed by apol into branch 'master'.

Fix list of available OpenCL C standards

Summary:
OpenCL C is based on the C99 standard, but doesn't conform with it.
Instead there are dedicated OpenCL standards.

This is still not entirely correct, since OpenCL requires the standard
to be passed via -cl-std=... instead of -std=..., but fixing this
requires additional changes.

Reviewers: #kdevelop, apol

Reviewed By: #kdevelop, apol

Subscribers: apol, kdevelop-devel

Differential Revision: https://phabricator.kde.org/D5978

M  +1    -1    languages/plugins/custom-definesandincludes/compilerprovider/settingsmanager.cpp
 M  +3    -8    languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui


https://commits.kde.org/kdevelop/4f555d7f3437a985e3b719319d947ca36c3d5a42

diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/settingsmanager.cpp \
b/languages/plugins/custom-definesandincludes/compilerprovider/settingsmanager.cpp \
                index 7606111ea5..2423c4c73c 100644
--- a/languages/plugins/custom-definesandincludes/compilerprovider/settingsmanager.cpp
                
+++ b/languages/plugins/custom-definesandincludes/compilerprovider/settingsmanager.cpp
 @@ -83,7 +83,7 @@ ParserArguments defaultArguments()
     const static ParserArguments arguments{
         QStringLiteral("-ferror-limit=100 -fspell-checking -Wdocumentation \
                -Wunused-parameter -Wunreachable-code -Wall -std=c99"),
         QStringLiteral("-ferror-limit=100 -fspell-checking -Wdocumentation \
                -Wunused-parameter -Wunreachable-code -Wall -std=c++11"),
-        QStringLiteral("-ferror-limit=100 -fspell-checking -Wdocumentation \
-Wunused-parameter -Wunreachable-code -Wall -std=c++11"), +        \
QStringLiteral("-ferror-limit=100 -fspell-checking -Wdocumentation -Wunused-parameter \
                -Wunreachable-code -Wall -std=CL1.1"),
         QStringLiteral("-ferror-limit=100 -fspell-checking -Wdocumentation \
-Wunused-parameter -Wunreachable-code -Wall -std=c++11"),  true
     };
diff --git a/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui \
b/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui index \
                9baa690ff4..6a756de371 100644
--- a/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui
+++ b/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.ui
@@ -211,22 +211,17 @@
         </item>
         <item>
          <property name="text">
-          <string>c++03</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>c++11</string>
+          <string>CL1.1</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>c++14</string>
+          <string>CL1.2</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>c99</string>
+          <string>CL2.0</string>
          </property>
         </item>
        </widget>


[prev in list] [next in list] [prev in thread] [next in thread]