From 91c0629fe10991b0f1158ec12d9cd08e69cb5b7e Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 27 Feb 2015 14:43:25 +0100 Subject: [PATCH] CppTools: Handle _Pragma() and __pragma() These operators led to parse errors, most prominently in Q_OBJECT uses since this macro nowdays uses these operators. Task-number: QTCREATORBUG-13905 Change-Id: I65632820d02ca5c5ef0b98f5d969cdc516d7f5b0 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppmodelmanager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index ea7c038d7f..d52d209a1e 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -179,6 +179,8 @@ const char pp_configuration[] = "#define __builtin_va_arg(a,b) ((b)0)\n" + "#define _Pragma(x)\n" // C99 _Pragma operator + // ### add macros for win32 "#define __cdecl\n" "#define __stdcall\n" @@ -193,7 +195,8 @@ const char pp_configuration[] = "#define __except catch\n" "#define __finally\n" "#define __inline inline\n" - "#define __forceinline inline\n"; + "#define __forceinline inline\n" + "#define __pragma(x)\n"; QSet CppModelManager::timeStampModifiedFiles(const QList &documentsToCheck) { -- GitLab