wip: Fix CI failure #2

EricCousineau-TRI · Apr 10, 2018 · 33eabdd · 33eabdd
1 parent 707f5b2
commit 33eabdd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/pybind11/numpy_dtypes_user.h b/include/pybind11/numpy_dtypes_user.h
@@ -578,8 +578,10 @@ class dtype_user : public object {
     // recursive loops.
     tp_as_number.nb_float = &handle_nb_conversion<double>;
     tp_as_number.nb_int = &handle_nb_conversion<int>;
+#if PY_VERSION_HEX < 0x03000000
     tp_as_number.nb_long = &handle_nb_conversion<int>;
     tp_as_number.nb_coerce = &disable_nb_coerce;
+#endif
     // Create views into created type.
     self() = reinterpret_borrow<object>(handle((PyObject*)&ClassObject_Type));
     cls_ = self();

diff --git a/tests/test_numpy_dtypes_user.cpp b/tests/test_numpy_dtypes_user.cpp
@@ -332,7 +332,7 @@ TEST_SUBMODULE(numpy_dtype_user, m) {
 
     m.def("add_one", [](py::handle in) {
         auto value = py::cast<py::array_t<Custom>>(in.attr("flat"));
-        int count = value.size();
+        int count = static_cast<int>(value.size());
         for (int i = 0; i < count; ++i) {
             auto& x = value.mutable_at(i);
             x += 1;