Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing `git rebase -X theirs` accident.

This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-18 05:40:57 -07:00 committed by Ralf W. Grosse-Kunstleve
parent 4ab4f36a92
commit bc21158082
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pybind11/detail/smart_holder_poc.h
View File

@ -195,8 +195,7 @@ struct smart_holder {
}
void reset_vptr_deleter_armed_flag(bool armed_flag) const {
// The const_cast is only for certain compilers (Ubuntu 20 GCC 6.3.0 being one).
auto vptr_del_ptr = const_cast<guarded_delete *>(std::get_deleter<guarded_delete>(vptr));
auto vptr_del_ptr = std::get_deleter<guarded_delete>(vptr);
if (vptr_del_ptr == nullptr) {
throw std::runtime_error(
"smart_holder::reset_vptr_deleter_armed_flag() called in an invalid context.");