From 1e489705f5ff92b90145d2fd31a6178e9459db2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Kristian=20Kj=C3=A6rg=C3=A5rd=20Madsen?= Date: Mon, 4 Jul 2022 12:33:24 +0200 Subject: [PATCH 1/2] Fix nvcc compile error --- src/catch2/benchmark/catch_constructor.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/catch2/benchmark/catch_constructor.hpp b/src/catch2/benchmark/catch_constructor.hpp index 1effad563c..22d4559265 100644 --- a/src/catch2/benchmark/catch_constructor.hpp +++ b/src/catch2/benchmark/catch_constructor.hpp @@ -59,7 +59,7 @@ namespace Catch { } T const& stored_object() const { - return *static_cast(static_cast(data)); + return *static_cast(const_cast(static_cast(data))); } From ac6ea10a0f1f3703d61d4caa7e523509af95b25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Kristian=20Kj=C3=A6rg=C3=A5rd=20Madsen?= Date: Tue, 5 Jul 2022 14:25:09 +0200 Subject: [PATCH 2/2] Changes based on discussion --- src/catch2/benchmark/catch_constructor.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/catch2/benchmark/catch_constructor.hpp b/src/catch2/benchmark/catch_constructor.hpp index 22d4559265..86bbfb00de 100644 --- a/src/catch2/benchmark/catch_constructor.hpp +++ b/src/catch2/benchmark/catch_constructor.hpp @@ -59,7 +59,7 @@ namespace Catch { } T const& stored_object() const { - return *static_cast(const_cast(static_cast(data))); + return *static_cast(static_cast(data)); }