From 31234b1869a66d161fd6b916823cae66d03e22f7 Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Wed, 3 Feb 2010 17:54:32 -0200
Subject: Do not count user added constructor when searching for implicity
 conversions.

Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>
---
 abstractmetalang.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'abstractmetalang.cpp')

diff --git a/abstractmetalang.cpp b/abstractmetalang.cpp
index 89934ec84..2724d6ce4 100644
--- a/abstractmetalang.cpp
+++ b/abstractmetalang.cpp
@@ -1105,8 +1105,14 @@ AbstractMetaFunctionList AbstractMetaClass::implicitConversions() const
     AbstractMetaFunctionList list = queryFunctions(Constructors);
     AbstractMetaFunctionList returned;
     foreach (AbstractMetaFunction *f, list) {
-        if ((f->actualMinimumArgumentCount() == 1 || f->arguments().size() == 1) && !f->isExplicit() && !f->isCopyConstructor() && !f->isModifiedRemoved() && hasCloneOperator())
+        if ((f->actualMinimumArgumentCount() == 1 || f->arguments().size() == 1)
+            && !f->isExplicit()
+            && !f->isCopyConstructor()
+            && !f->isModifiedRemoved()
+            && !f->isUserAdded()
+            && hasCloneOperator()) {
             returned += f;
+        }
     }
     return returned;
 }
-- 
cgit v1.2.3