From c8bdd0bee4325ff50216fc39da2c9dfa8219cb56 Mon Sep 17 00:00:00 2001 From: Roberto Raggi <roberto.raggi@nokia.com> Date: Mon, 23 Feb 2009 09:53:26 +0100 Subject: [PATCH] Skip __complex__, __imag__ and __real__ --- src/plugins/cpptools/cppmodelmanager.cpp | 4 ++++ tests/manual/binding/c++ | 1 - tests/manual/binding/conf.c++ | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 5c837db64d2..8964d1385ba 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -140,6 +140,10 @@ static const char pp_configuration[] = "#define restrict\n" "#define __restrict\n" + "#define __complex__\n" + "#define __imag__\n" + "#define __real__\n" + // ### add macros for win32 "#define __cdecl\n" "#define QT_WA(x) x\n" diff --git a/tests/manual/binding/c++ b/tests/manual/binding/c++ index dcdbeef64de..79ec597fcb1 100755 --- a/tests/manual/binding/c++ +++ b/tests/manual/binding/c++ @@ -5,4 +5,3 @@ echo "Generating $t" ${CPP-gcc} -xc++ -E -include $me/conf.c++ $* > $t echo "Parsing $t" $me/cplusplus0 $t - diff --git a/tests/manual/binding/conf.c++ b/tests/manual/binding/conf.c++ index c179f979272..c966da060a8 100644 --- a/tests/manual/binding/conf.c++ +++ b/tests/manual/binding/conf.c++ @@ -6,3 +6,6 @@ #define restrict #define __restrict #define __weak +#define __complex__ +#define __imag__ +#define __real__ -- GitLab