@@ -127,9 +127,6 @@ class ufunc : public object {
127
127
entries.reset (new entries_t (name));
128
128
}
129
129
130
- ufunc (const ufunc& other) {
131
- }
132
-
133
130
~ufunc () {
134
131
if (entries)
135
132
finalize ();
@@ -230,12 +227,12 @@ class ufunc : public object {
230
227
// Store core functionn.
231
228
core_funcs_.push_back (func);
232
229
core_data_.push_back (data);
233
- int ncore = core_funcs_.size ();
234
- int t_index = core_type_args_.size ();
230
+ size_t ncore = core_funcs_.size ();
231
+ size_t t_index = core_type_args_.size ();
235
232
int nargs = nin_ + nout_;
236
233
core_type_args_.resize (ncore * nargs);
237
- for (int i = 0 ; i < dtype_args.size (); ++i) {
238
- core_type_args_.at (t_index++) = dtype_args[i];
234
+ for (size_t i = 0 ; i < dtype_args.size (); ++i) {
235
+ core_type_args_.at (t_index++) = ( char ) dtype_args[i];
239
236
}
240
237
}
241
238
@@ -249,16 +246,16 @@ class ufunc : public object {
249
246
}
250
247
251
248
detail::PyUFuncObject* create_core () {
252
- int ncore = core_funcs_.size ();
253
- char * name_raw = ( char *) name ();
249
+ int ncore = ( int ) core_funcs_.size ();
250
+ char * name_raw = const_cast < char *>( name () );
254
251
return (detail::PyUFuncObject*)detail::npy_api::get ().PyUFunc_FromFuncAndData_ (
255
252
core_funcs_.data (), core_data_.data (), core_type_args_.data (), ncore,
256
253
nin_, nout_, detail::npy_api::constants::PyUFunc_None_, name_raw, nullptr , 0 );
257
254
}
258
255
259
256
void create_user (detail::PyUFuncObject* h) {
260
- int nuser = user_funcs_.size ();
261
- for (int i = 0 ; i < nuser; ++i) {
257
+ size_t nuser = user_funcs_.size ();
258
+ for (size_t i = 0 ; i < nuser; ++i) {
262
259
if (detail::npy_api::get ().PyUFunc_RegisterLoopForType_ (
263
260
h, user_types_[i], user_funcs_[i], user_type_args_[i].data (), user_data_[i]) < 0 )
264
261
pybind11_fail (" ufunc: Failed to register custom ufunc" );
0 commit comments