Skip to content

Commit ab28091

Browse files
committed
unittest/vector.cpp
remove useless include remove comment between includes (not sorted by pre-commit anymore) core/std-vector.hpp * fix using-ctor for older cpp versions * fix warning about conversion
1 parent bf7840f commit ab28091

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

include/eigenpy/std-vector.hpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ struct overload_base_get_item_for_std_vector
112112
bp::extract<long> i(i_);
113113
if (i.check()) {
114114
long index = i();
115-
if (index < 0) index += container.size();
115+
if (index < 0) index += (long)container.size();
116116
if (index >= long(container.size()) || index < 0) {
117117
PyErr_SetString(PyExc_IndexError, "Index out of range");
118118
bp::throw_error_already_set();
@@ -158,23 +158,26 @@ struct extract<Eigen::Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols> &>
158158
typedef Eigen::Matrix<Scalar, Rows, Cols, Options, MaxRows, MaxCols>
159159
MatrixType;
160160
typedef extract_to_eigen_ref<MatrixType> base;
161-
using base::base;
161+
extract(PyObject *o) : base(o) {}
162+
extract(api::object const &o) : base(o.ptr()) {}
162163
};
163164

164165
template <typename Derived>
165166
struct extract<Eigen::MatrixBase<Derived> &>
166167
: extract_to_eigen_ref<Eigen::MatrixBase<Derived> > {
167168
typedef Eigen::MatrixBase<Derived> MatrixType;
168169
typedef extract_to_eigen_ref<MatrixType> base;
169-
using base::base;
170+
extract(PyObject *o) : base(o) {}
171+
extract(api::object const &o) : base(o.ptr()) {}
170172
};
171173

172174
template <typename Derived>
173175
struct extract<Eigen::RefBase<Derived> &>
174176
: extract_to_eigen_ref<Eigen::RefBase<Derived> > {
175177
typedef Eigen::RefBase<Derived> MatrixType;
176178
typedef extract_to_eigen_ref<MatrixType> base;
177-
using base::base;
179+
extract(PyObject *o) : base(o) {}
180+
extract(api::object const &o) : base(o.ptr()) {}
178181
};
179182

180183
namespace converter {

unittest/eigen_ref.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <iostream>
77

88
#include "eigenpy/eigenpy.hpp"
9-
// include main header first
109
#include "eigenpy/eigen-from-python.hpp"
1110

1211
using namespace Eigen;

unittest/vector.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
/// @file
2+
/// @copyright Copyright 2022, CNRS
3+
/// @copyright Copyright 2022, INRIA
14
#include <ostream>
2-
#include <type_traits>
35

46
#include "eigenpy/eigenpy.hpp"
5-
// include main first
67
#include "eigenpy/eigen-from-python.hpp"
78
#include "eigenpy/std-vector.hpp"
89

0 commit comments

Comments
 (0)