fix: support Python < 3.6

henryiii · henryiii · commit 63f069548d7b · 2022-02-03T16:23:26.000-05:00
diff --git a/include/pybind11/gil.h b/include/pybind11/gil.h
@@ -130,7 +130,9 @@ class gil_scoped_release {
         auto &internals = detail::get_internals();
         tstate = PyEval_SaveThread();
         if (disassoc) {
-            auto *key = internals.tstate;
+            // Python >= 3.7 can remove this, it's an int before 3.7
+            // NOLINTNEXTLINE(readability-qualified-auto)
+            auto key = internals.tstate;
             PYBIND11_TLS_DELETE_VALUE(key);
         }
     }
@@ -149,7 +151,9 @@ class gil_scoped_release {
         if (active)
             PyEval_RestoreThread(tstate);
         if (disassoc) {
-            auto *key = detail::get_internals().tstate;
+            // Python >= 3.7 can remove this, it's an int before 3.7
+            // NOLINTNEXTLINE(readability-qualified-auto)
+            auto key = detail::get_internals().tstate;
             PYBIND11_TLS_REPLACE_VALUE(key, tstate);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,9 @@ class gil_scoped_release {`
`130`	`130`	`auto &internals = detail::get_internals();`
`131`	`131`	`tstate = PyEval_SaveThread();`
`132`	`132`	`if (disassoc) {`
`133`		`- auto *key = internals.tstate;`
	`133`	`+ // Python >= 3.7 can remove this, it's an int before 3.7`
	`134`	`+ // NOLINTNEXTLINE(readability-qualified-auto)`
	`135`	`+ auto key = internals.tstate;`
`134`	`136`	`PYBIND11_TLS_DELETE_VALUE(key);`
`135`	`137`	`}`
`136`	`138`	`}`
`@@ -149,7 +151,9 @@ class gil_scoped_release {`
`149`	`151`	`if (active)`
`150`	`152`	`PyEval_RestoreThread(tstate);`
`151`	`153`	`if (disassoc) {`
`152`		`- auto *key = detail::get_internals().tstate;`
	`154`	`+ // Python >= 3.7 can remove this, it's an int before 3.7`
	`155`	`+ // NOLINTNEXTLINE(readability-qualified-auto)`
	`156`	`+ auto key = detail::get_internals().tstate;`
`153`	`157`	`PYBIND11_TLS_REPLACE_VALUE(key, tstate);`
`154`	`158`	`}`
`155`	`159`	`}`