From b2c4ff6052c4bb91c087f565cad534be38410655 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Mon, 15 Jul 2019 17:29:13 +0200 Subject: [PATCH] renamed local gil_scoped_acquire to gil_scoped_acquire_local to avoid ambiguity --- include/pybind11/detail/internals.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h index 952f8017..7235121d 100644 --- a/include/pybind11/detail/internals.h +++ b/include/pybind11/detail/internals.h @@ -173,9 +173,9 @@ PYBIND11_NOINLINE inline internals &get_internals() { // Ensure that the GIL is held since we will need to make Python calls. // Cannot use py::gil_scoped_acquire here since that constructor calls get_internals. - struct gil_scoped_acquire { - gil_scoped_acquire() : state (PyGILState_Ensure()) {} - ~gil_scoped_acquire() { PyGILState_Release(state); } + struct gil_scoped_acquire_local { + gil_scoped_acquire_local() : state (PyGILState_Ensure()) {} + ~gil_scoped_acquire_local() { PyGILState_Release(state); } const PyGILState_STATE state; } gil;