Merge branch 'master' into extensibleconversions

Conflicts:
	cppgenerator.cpp
	libshiboken/basewrapper.cpp

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>

3 files changed, 15 insertions, 0 deletions

diff --git a/tests/libsample/abstract.h b/tests/libsample/abstract.h
index 06f8d983e..008570560 100644
--- a/tests/libsample/abstract.h
+++ b/tests/libsample/abstract.h
@@ -50,6 +50,10 @@ public:
         ClassNameAndId
     };
 
+    enum Type {
+        TpAbstract, TpDerived
+    };
+
     int primitiveField;
     Point valueTypeField;
     ObjectType* objectTypeField;
@@ -76,6 +80,7 @@ public:
     void callUnpureVirtual();
 
     void show(PrintFormat format = Verbose);
+    virtual Type type() const { return TpAbstract; }
 
 protected:
     virtual const char* className() { return "Abstract"; }
diff --git a/tests/libsample/derived.cpp b/tests/libsample/derived.cpp
index 0a3646258..39d9f30e6 100644
--- a/tests/libsample/derived.cpp
+++ b/tests/libsample/derived.cpp
@@ -107,3 +107,11 @@ Abstract* Derived::triggerImpossibleTypeDiscovery()
 {
     return new SecrectClass;
 }
+
+struct AnotherSecretClass : public Derived {
+};
+
+Abstract* Derived::triggerAnotherImpossibleTypeDiscovery()
+{
+    return new AnotherSecretClass;
+}
diff --git a/tests/libsample/derived.h b/tests/libsample/derived.h
index 832148e35..c5acb9488 100644
--- a/tests/libsample/derived.h
+++ b/tests/libsample/derived.h
@@ -64,6 +64,7 @@ public:
     virtual void unpureVirtual();
 
     virtual PrintFormat returnAnEnum() { return Short; }
+    virtual Type type() const { return TpDerived; }
 
     // factory method
     static Abstract* createObject();
@@ -85,6 +86,7 @@ public:
     SomeInnerClass returnMyParameter(const SomeInnerClass& s) { return s; }
 
     static Abstract* triggerImpossibleTypeDiscovery();
+    static Abstract* triggerAnotherImpossibleTypeDiscovery();
 protected:
     const char* getClassName() { return className(); }
     virtual const char* className() { return "Derived"; }