Merge pull request #94 from lsst/tickets/DM-30023

DM-30023: replace uncaught_exception by uncaught_exceptions
lsst · May 5, 2021 · 0bf7090 · 0bf7090
2 parents cb07a25 + 098df24
commit 0bf7090
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/lsst/utils/python.h b/include/lsst/utils/python.h
@@ -280,7 +280,7 @@ class LSST_PRIVATE WrapperCollection final {
     WrapperCollection & operator=(WrapperCollection &&) = delete;
 
     ~WrapperCollection() noexcept {
-        if (!std::uncaught_exception() && !_definitions.empty()) {
+        if (std::uncaught_exceptions()==0 && !_definitions.empty()) {
             PyErr_SetString(PyExc_ImportError,
                             "WrapperCollection::finish() not called; module definition incomplete.");
             PyErr_WriteUnraisable(module.ptr());