Skip to content

Commit 4492a1a

Browse files
authored
Merge pull request #250 from jcarpent/devel
Fix compilation warnings
2 parents b6a9c32 + e0197d9 commit 4492a1a

File tree

8 files changed

+3
-129
lines changed

8 files changed

+3
-129
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "cmake"]
22
path = cmake
33
url = https://github.com/jrl-umi3218/jrl-cmakemodules.git
4-
[submodule ".travis"]
5-
path = .travis
6-
url = https://github.com/jrl-umi3218/jrl-travis.git

.travis

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 0 additions & 90 deletions
This file was deleted.

include/eigenpy/numpy-type.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace eigenpy
2020
template<typename Scalar>
2121
bool np_type_is_convertible_into_scalar(const int np_type)
2222
{
23-
if(NumpyEquivalentType<Scalar>::type_code >= NPY_USERDEF)
23+
if(static_cast<NPY_TYPES>(NumpyEquivalentType<Scalar>::type_code) >= NPY_USERDEF)
2424
return np_type == Register::getTypeCode<Scalar>();
2525

2626
if(NumpyEquivalentType<Scalar>::type_code == np_type)

include/eigenpy/numpy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace eigenpy
3333
int EIGENPY_DLLAPI PyArray_TypeNum(PyTypeObject * type);
3434

3535
// By default, the Scalar is considered as a Python object
36-
template <typename Scalar> struct NumpyEquivalentType { enum { type_code = NPY_USERDEF };};
36+
template <typename Scalar> struct NumpyEquivalentType { enum { type_code = NPY_USERDEF };};
3737

3838
template <> struct NumpyEquivalentType<float> { enum { type_code = NPY_FLOAT };};
3939
template <> struct NumpyEquivalentType< std::complex<float> > { enum { type_code = NPY_CFLOAT };};

include/eigenpy/user-type.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace eigenpy
1717
{
1818
static To run(const From & from)
1919
{
20-
return static_cast<To>(from);
20+
return (To)from;
2121
}
2222

2323
};

travis_custom/custom_before_install

Lines changed: 0 additions & 14 deletions
This file was deleted.

travis_custom/custom_build

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)