Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-01-31 15:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix scope?

Browse Source
This commit is contained in:
Michael Carlstrom 2024-12-19 13:31:09 -08:00
parent 9f532cfc46
commit 8b241f1727
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/pybind11/cast.h
View File

@ -1366,6 +1366,9 @@ object object_or_cast(T &&o) {
return pybind11::cast(std::forward<T>(o)); return pybind11::cast(std::forward<T>(o));
} }
// This is being used to get around the conflict with the deprecated str() function on object_api
typedef str py_str;
// Declared in pytypes.h: // Declared in pytypes.h:
// Written here so make_caster<T> can be used // Written here so make_caster<T> can be used
template <typename D> template <typename D>
@ -1379,7 +1382,7 @@ obj_attr_accessor object_api<D>::attr_with_type_hint(handle key) const {
object ann = annotations(); object ann = annotations();
object reinterpreted_key = reinterpret_borrow<object>(key); object reinterpreted_key = reinterpret_borrow<object>(key);
if (ann.contains(reinterpreted_key)) { if (ann.contains(reinterpreted_key)) {
throw std::runtime_error("__annotations__[\"" + std::string(str(reinterpreted_key)) throw std::runtime_error("__annotations__[\"" + py_str(reinterpreted_key)
+ "\"] was set already."); + "\"] was set already.");
} }
ann[key] = make_caster<T>::name.text; ann[key] = make_caster<T>::name.text;