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

List:       kde-commits
Subject:    [kde-workspace] kcontrol/keyboard: Extend the GCC workaround to other affected GCC versions too
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2013-11-21 18:57:32
Message-ID: E1VjZRU-0008Hc-NN () scm ! kde ! org
[Download RAW message or body]

Git commit 999798d0a97f3b1a2faae7c534aaeece3d355432 by Martin Klapetek.
Committed on 21/11/2013 at 18:57.
Pushed by mklapetek into branch 'master'.

Extend the GCC workaround to other affected GCC versions too

M  +2    -2    kcontrol/keyboard/xkb_rules.cpp

http://commits.kde.org/kde-workspace/999798d0a97f3b1a2faae7c534aaeece3d355432

diff --git a/kcontrol/keyboard/xkb_rules.cpp b/kcontrol/keyboard/xkb_rules.cpp
index ef99cac..51153c3 100644
--- a/kcontrol/keyboard/xkb_rules.cpp
+++ b/kcontrol/keyboard/xkb_rules.cpp
@@ -87,8 +87,8 @@ template<class T>
 void removeEmptyItems(QList<T*>& list)
 {
 #ifdef __GNUC__
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ == 2
-#warning Compiling with a workaround for GCC 4.8.2 \
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800 +#if __GNUC__ == 4 && \
(__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 3) || (__GNUC_MINOR__ == 7 && \
__GNUC_PATCHLEVEL__ < 4) +#warning Compiling with a workaround for GCC < 4.8.3 || GCC \
< 4.7.4 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800  Q_FOREACH(T* x, list) {
         ConfigItem *y = static_cast<ConfigItem*>(x);
         if (y->name.isEmpty()) {


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