Skip to content

Commit 4c39988

Browse files
committed
Merge branch 'master' into numpy-core-import-update
2 parents f2f497e + 7e5edbc commit 4c39988

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/pybind11/numpy.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ PYBIND11_NOINLINE module_ import_numpy_core_submodule(const char *submodule_name
131131
/* `numpy.core` was renamed to `numpy._core` in NumPy 2.0 as it officially
132132
became a private module. */
133133
if (major_version >= 2) {
134-
return py::module_::import((std::string("numpy._core.") + submodule_name).c_str());
134+
return module_::import((std::string("numpy._core.") + submodule_name).c_str());
135135
} else {
136-
return py::module_::import((std::string("numpy.core.") + submodule_name).c_str());
136+
return module_::import((std::string("numpy.core.") + submodule_name).c_str());
137137
}
138138
}
139139

include/pybind11/pybind11.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ class cpp_function : public function {
11421142
}
11431143
msg += "kwargs: ";
11441144
bool first = true;
1145-
for (auto kwarg : kwargs) {
1145+
for (const auto &kwarg : kwargs) {
11461146
if (first) {
11471147
first = false;
11481148
} else {

0 commit comments

Comments
 (0)