From 37fefe34792fcae1bd4b412dd548661b63139f52 Mon Sep 17 00:00:00 2001 From: PKEuS Date: Sun, 3 Jan 2016 10:32:55 +0100 Subject: [PATCH] Removed non-standard code annotations with __attribute__ --- gui/translationhandler.cpp | 1 - gui/translationhandler.h | 4 +--- lib/config.h | 3 --- lib/symboldatabase.h | 2 +- lib/tokenize.h | 10 +++------- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp index 45d48c334..e14577d6e 100644 --- a/gui/translationhandler.cpp +++ b/gui/translationhandler.cpp @@ -26,7 +26,6 @@ #include "translationhandler.h" -static void unused() __attribute__((unused)); // Provide own translations for standard buttons. This (garbage) code is needed to enforce them to appear in .ts files even after "lupdate gui.pro" static void unused() { diff --git a/gui/translationhandler.h b/gui/translationhandler.h index f259ab24e..e94c13105 100644 --- a/gui/translationhandler.h +++ b/gui/translationhandler.h @@ -23,9 +23,7 @@ #include #include #include -#ifndef __GNUC__ -#define __attribute__(A) -#endif + /// @addtogroup GUI /// @{ diff --git a/lib/config.h b/lib/config.h index 05d5dab75..c30782c9e 100644 --- a/lib/config.h +++ b/lib/config.h @@ -19,9 +19,6 @@ # include #endif -#ifndef __GNUC__ -#define __attribute__(A) -#endif #include static const std::string emptyString; diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h index 6bb228a76..72318b18f 100644 --- a/lib/symboldatabase.h +++ b/lib/symboldatabase.h @@ -1045,7 +1045,7 @@ private: * Send error message to error logger about internal bug. * @param tok the token that this bug concerns. */ - void cppcheckError(const Token *tok) const __attribute__((noreturn)); + void cppcheckError(const Token *tok); /** Whether iName is a keyword as defined in http://en.cppreference.com/w/c/keyword and http://en.cppreference.com/w/cpp/keyword*/ bool isReservedName(const std::string& iName) const; diff --git a/lib/tokenize.h b/lib/tokenize.h index d5746e632..01b7b9eb3 100644 --- a/lib/tokenize.h +++ b/lib/tokenize.h @@ -31,10 +31,6 @@ #include #include -#ifndef __GNUC__ -#define __attribute__(A) -#endif - class Settings; class SymbolDatabase; class TimerResults; @@ -585,7 +581,7 @@ private: * Send error message to error logger about internal bug. * @param tok the token that this bug concerns. */ - void cppcheckError(const Token *tok) const __attribute__((noreturn)); + void cppcheckError(const Token *tok) const; /** * Setup links for tokens so that one can call Token::link(). @@ -600,10 +596,10 @@ private: public: /** Syntax error */ - void syntaxError(const Token *tok) const __attribute__((noreturn)); + void syntaxError(const Token *tok) const; /** Syntax error. Example: invalid number of ')' */ - void syntaxError(const Token *tok, char c) const __attribute__((noreturn)); + void syntaxError(const Token *tok, char c) const; private: