Added template specializations for SbkType<T> when T is a primitive type.

1 files changed, 81 insertions, 5 deletions

diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index 93d777fcd..8faad93b9 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -49,15 +49,91 @@
 namespace Shiboken
 {
 /**
-*   This function template is used to get the PyObjectType of a C++ type T.
-*   It's main usage is to handle multiple inheritance casts.
+*   This function template is used to get the PyTypeObject of a C++ type T.
+*   All implementations should be provided by template specializations generated by the generator when
+*   T isn't a C++ primitive type.
 *   \see SpecialCastFunction
 */
 template<typename T>
-inline PyTypeObject* SbkType()
+PyTypeObject* SbkType();
+
+template<>
+inline PyTypeObject* SbkType<int>()
+{
+    return &PyInt_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<unsigned int>()
+{
+    return &PyLong_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<short>()
+{
+    return &PyInt_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<unsigned short>()
+{
+    return &PyInt_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<long>()
+{
+    return &PyLong_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<unsigned long>()
+{
+    return &PyLong_Type;
+}
+
+
+template<>
+inline PyTypeObject* SbkType<long long>()
+{
+    return &PyLong_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<unsigned long long>()
+{
+    return &PyLong_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<bool>()
+{
+    return &PyBool_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<float>()
+{
+    return &PyFloat_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<double>()
+{
+    return &PyFloat_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<char>()
+{
+    return &PyInt_Type;
+}
+
+template<>
+inline PyTypeObject* SbkType<unsigned char>()
 {
-    assert(false); // This *SHOULD* never be called.
-    return 0;
+    return &PyInt_Type;
 }
 
 /**