From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Fri, 5 Jan 2018 02:23:44 +0000 (-0500)
Subject: Make AssertCuda use Assert instead of AssertThrow
X-Git-Tag: v9.0.0-rc1~598^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5700%2Fhead;p=dealii.git

Make AssertCuda use Assert instead of AssertThrow

We used AssertThrow instead of Assert in AssertCuda because of a bug that has
now been fixed.
---

diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h
index 2f36c5320d..cdc1d5013c 100644
--- a/include/deal.II/base/exceptions.h
+++ b/include/deal.II/base/exceptions.h
@@ -1244,10 +1244,8 @@ namespace StandardExceptions
  * @ingroup Exceptions
  * @author Bruno Turcksin, 2016
  */
-// For now use AssertThrow instead of Assert because macros are not passed
-// correctly to nvcc.
-#define AssertCuda(error_code) AssertThrow(error_code == cudaSuccess, \
-                                           dealii::ExcCudaError(cudaGetErrorString(error_code)))
+#define AssertCuda(error_code) Assert(error_code == cudaSuccess, \
+                                      dealii::ExcCudaError(cudaGetErrorString(error_code)))
 #endif
 
 using namespace StandardExceptions;