Adapt to std::uncaught_exception() deprecation

ginkgo-project · May 5, 2023 · 18c5600 · 18c5600
1 parent 362ada6
commit 18c5600
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/cuda/base/pointer_mode_guard.hpp b/cuda/base/pointer_mode_guard.hpp
@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <ginkgo/core/base/exception_helpers.hpp>
+#include <ginkgo/core/base/std_extensions.hpp>
 
 
 namespace gko {
@@ -79,7 +80,7 @@ class pointer_mode_guard {
     ~pointer_mode_guard() noexcept(false)
     {
         /* Ignore the error during stack unwinding for this call */
-        if (std::uncaught_exception()) {
+        if (xstd::uncaught_exception()) {
             cublasSetPointerMode(*l_handle, CUBLAS_POINTER_MODE_DEVICE);
         } else {
             GKO_ASSERT_NO_CUBLAS_ERRORS(
@@ -126,7 +127,7 @@ class pointer_mode_guard {
     ~pointer_mode_guard() noexcept(false)
     {
         /* Ignore the error during stack unwinding for this call */
-        if (std::uncaught_exception()) {
+        if (xstd::uncaught_exception()) {
             cusparseSetPointerMode(l_handle, CUSPARSE_POINTER_MODE_DEVICE);
         } else {
             GKO_ASSERT_NO_CUSPARSE_ERRORS(

diff --git a/hip/base/pointer_mode_guard.hip.hpp b/hip/base/pointer_mode_guard.hip.hpp
@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <ginkgo/core/base/exception_helpers.hpp>
 #include <ginkgo/core/base/executor.hpp>
+#include <ginkgo/core/base/std_extensions.hpp>
 
 
 namespace gko {
@@ -81,7 +82,7 @@ class pointer_mode_guard {
     ~pointer_mode_guard() noexcept(false)
     {
         /* Ignore the error during stack unwinding for this call */
-        if (std::uncaught_exception()) {
+        if (xstd::uncaught_exception()) {
             hipblasSetPointerMode(reinterpret_cast<hipblasHandle_t>(l_handle),
                                   HIPBLAS_POINTER_MODE_DEVICE);
         } else {
@@ -131,7 +132,7 @@ class pointer_mode_guard {
     ~pointer_mode_guard() noexcept(false)
     {
         /* Ignore the error during stack unwinding for this call */
-        if (std::uncaught_exception()) {
+        if (xstd::uncaught_exception()) {
             hipsparseSetPointerMode(
                 reinterpret_cast<hipsparseHandle_t>(l_handle),
                 HIPSPARSE_POINTER_MODE_DEVICE);

diff --git a/include/ginkgo/core/base/std_extensions.hpp b/include/ginkgo/core/base/std_extensions.hpp
@@ -34,6 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GKO_PUBLIC_CORE_BASE_STD_EXTENSIONS_HPP_
 
 
+#include <exception>
 #include <functional>
 #include <memory>
 #include <type_traits>
@@ -69,6 +70,16 @@ template <typename... Ts>
 using void_t = typename detail::make_void<Ts...>::type;
 
 
+// Disable deprecation warnings when using standard > 2014
+inline bool uncaught_exception() noexcept {
+#if __cplusplus > 201402L
+    return std::uncaught_exceptions() > 0;
+#else
+    return std::uncaught_exception();
+#endif
+}
+
+
 // Kept for backward compatibility.
 template <bool B, typename T = void>
 using enable_if_t = std::enable_if_t<B, T>;