aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-02-02 15:55:22 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-02-08 11:36:02 +0000
commit23c1e502c90d0206a35ee42b77b7ab7792b36891 (patch)
treeeee554876fdf0ecd8fc76e218f1a8d9f9fb0dcfa
parent5aea62a20195ff45d8f471609a135b9053547b5f (diff)
AbstractMetaBuilder: Fix type check
AbstractMetaBuilderPrivate::fixReturnTypeOfConversionOperator() is supposed to apply some changes to a conversion operator like class A { operator int() const; }; The old C++ parser has a bug in that it creates this as a function of return type "A" instead of "int" and this is also checked at the top of the function. Remove the check since that causes the function to not do anything if the correct type "int" is passed. Task-number: PYSIDE-323 Change-Id: I19e5b83599dccd5737209dd2e92064e80e8a506d Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--ApiExtractor/abstractmetabuilder.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/ApiExtractor/abstractmetabuilder.cpp b/ApiExtractor/abstractmetabuilder.cpp
index 85d959d50..98c91f7ee 100644
--- a/ApiExtractor/abstractmetabuilder.cpp
+++ b/ApiExtractor/abstractmetabuilder.cpp
@@ -1468,8 +1468,7 @@ void AbstractMetaBuilderPrivate::setupFunctionDefaults(AbstractMetaFunction *met
void AbstractMetaBuilderPrivate::fixReturnTypeOfConversionOperator(AbstractMetaFunction *metaFunction)
{
- if (!metaFunction->isConversionOperator()
- || metaFunction->implementingClass()->typeEntry() != metaFunction->type()->typeEntry())
+ if (!metaFunction->isConversionOperator())
return;
TypeDatabase* types = TypeDatabase::instance();