From ec96947b1d8e56b6c242907880df4582cce65a5b Mon Sep 17 00:00:00 2001 From: Joseph Mirabel Date: Thu, 18 Oct 2018 10:26:20 +0200 Subject: [PATCH 1/2] [CMake] Synchronize module --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 52d25e05c..b47ff3fd6 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 52d25e05c3b5dfd70c79b3e75787fdc78c6f695e +Subproject commit b47ff3fd66e5f4cbca8eb5a7c078c735689f3ba8 From c21196cb56e867f99190ef8d0847bc8de88f33f0 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Thu, 18 Oct 2018 21:30:41 +0200 Subject: [PATCH 2/2] conversion: remove incorrect std::cerr This follows issue #44. --- include/eigenpy/details.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/eigenpy/details.hpp b/include/eigenpy/details.hpp index e80e3dfa2..babf71af7 100644 --- a/include/eigenpy/details.hpp +++ b/include/eigenpy/details.hpp @@ -187,12 +187,8 @@ namespace eigenpy static void* convertible(PyArrayObject* obj_ptr) { if (!PyArray_Check(obj_ptr)) - { -#ifndef NDEBUG - std::cerr << "The python object is not a numpy array." << std::endl; -#endif return 0; - } + if(MatType::IsVectorAtCompileTime) { // Special care of scalar matrix of dimension 1x1.