1 files changed, 20 insertions, 5 deletions
diff --git a/sources/shiboken2/libshiboken/sbkconverter.cpp b/sources/shiboken2/libshiboken/sbkconverter.cpp
index 0b18e49d4..b86e09fa2 100644
--- a/sources/shiboken2/libshiboken/sbkconverter.cpp
+++ b/sources/shiboken2/libshiboken/sbkconverter.cpp
@@ -39,20 +39,24 @@
 
 #include "sbkconverter.h"
 #include "sbkconverter_p.h"
+#include "sbkarrayconverter_p.h"
 #include "basewrapper_p.h"
-#include "google/dense_hash_map"
 #include "autodecref.h"
 #include "sbkdbg.h"
 #include "helper.h"
 
+#include <unordered_map>
+
 static SbkConverter** PrimitiveTypeConverters;
 
-typedef google::dense_hash_map<std::string, SbkConverter*> ConvertersMap;
+typedef std::unordered_map<std::string, SbkConverter *> ConvertersMap;
 static ConvertersMap converters;
 
 namespace Shiboken {
 namespace Conversions {
 
+void initArrayConverters();
+
 void init()
 {
     static SbkConverter* primitiveTypeConverters[] = {
@@ -77,8 +81,6 @@ void init()
     PrimitiveTypeConverters = primitiveTypeConverters;
 
     assert(converters.empty());
-    converters.set_empty_key("");
-    converters.set_deleted_key("?");
     converters["PY_LONG_LONG"] = primitiveTypeConverters[SBK_PY_LONG_LONG_IDX];
     converters["bool"] = primitiveTypeConverters[SBK_BOOL_IDX_1];
     converters["char"] = primitiveTypeConverters[SBK_CHAR_IDX];
@@ -96,9 +98,11 @@ void init()
     converters["unsigned long"] = primitiveTypeConverters[SBK_UNSIGNEDLONG_IDX];
     converters["unsigned short"] = primitiveTypeConverters[SBK_UNSIGNEDSHORT_IDX];
     converters["void*"] = primitiveTypeConverters[SBK_VOIDPTR_IDX];
+
+    initArrayConverters();
 }
 
-static SbkConverter* createConverterObject(PyTypeObject* type,
+SbkConverter *createConverterObject(PyTypeObject *type,
                                            PythonToCppFunc toCppPointerConvFunc,
                                            IsConvertibleToCppFunc toCppPointerCheckFunc,
                                            CppToPythonFunc pointerToPythonFunc,
@@ -255,6 +259,17 @@ PythonToCppFunc isPythonToCppConvertible(const SbkConverter *converter, PyObject
     return IsPythonToCppConvertible(converter, pyIn);
 }
 
+PythonToCppFunc isPythonToCppConvertible(const SbkArrayConverter *converter,
+                                         int dim1, int dim2, PyObject *pyIn)
+{
+    assert(pyIn);
+    for (IsArrayConvertibleToCppFunc f : converter->toCppConversions) {
+        if (PythonToCppFunc c = f(pyIn, dim1, dim2))
+            return c;
+    }
+    return nullptr;
+}
+
 PythonToCppFunc isPythonToCppReferenceConvertible(const SbkObjectType *type, PyObject *pyIn)
 {
     if (pyIn != Py_None) {