Eigen: fix overloaded call to make_tuple is ambiguous

wjakob · Feb 1, 2024 · 5d77ce6 · 5d77ce6
1 parent 4e3a86e
commit 5d77ce6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/nanobind/eigen/sparse.h b/include/nanobind/eigen/sparse.h
@@ -131,9 +131,9 @@ template <typename T> struct type_caster<T, enable_if_t<is_eigen_sparse_matrix_v
         StorageIndexNDArray inner_indices(src->innerIndexPtr(), 1, data_shape, owner);
 
         try {
-            return matrix_type(make_tuple(
+            return matrix_type(nanobind::make_tuple(
                                    std::move(data), std::move(inner_indices), std::move(outer_indices)),
-                               make_tuple(rows, cols))
+                               nanobind::make_tuple(rows, cols))
                 .release();
         } catch (python_error &e) {
             e.restore();

diff --git a/tests/test_eigen.cpp b/tests/test_eigen.cpp
@@ -1,3 +1,4 @@
+#include <nanobind/stl/complex.h>
 #include <nanobind/eigen/dense.h>
 #include <nanobind/eigen/sparse.h>
 #include <nanobind/trampoline.h>
@@ -165,6 +166,7 @@ NB_MODULE(test_eigen_ext, m) {
         assert(!m.isCompressed());
         return m.markAsRValue();
     });
+    m.def("sparse_complex", []() -> Eigen::SparseMatrix<std::complex<double>> { return {}; });
 
     /// issue #166
     using Matrix1d = Eigen::Matrix<double,1,1>;