From 779faaaeba8b4d6fa9b2cc62906cccb0be3edf03 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 14 Sep 2016 09:56:11 -0700 Subject: Fixed compilation warnings generated by nvcc 6.5 (and below) when compiling the EIGEN_THROW macro --- Eigen/src/Core/util/Memory.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Eigen/src/Core/util/Memory.h') diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 8601c8321..0439655ca 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -275,6 +275,7 @@ template EIGEN_DEVICE_FUNC inline T* construct_elements_of_array(T * destruct_elements_of_array(ptr, i); EIGEN_THROW; } + return NULL; } /***************************************************************************** @@ -305,6 +306,7 @@ template EIGEN_DEVICE_FUNC inline T* aligned_new(size_t size) aligned_free(result); EIGEN_THROW; } + return result; } template EIGEN_DEVICE_FUNC inline T* conditional_aligned_new(size_t size) @@ -320,6 +322,7 @@ template EIGEN_DEVICE_FUNC inline T* conditional_aligned conditional_aligned_free(result); EIGEN_THROW; } + return result; } /** \internal Deletes objects constructed with aligned_new -- cgit v1.2.3