mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-01-12 14:25:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation warnings generated by nvcc 6.5 (and below) when compiling the EIGEN_THROW macro

Browse Source
This commit is contained in:
Benoit Steiner 2016-09-14 09:56:11 -07:00
parent ff47717f25
commit 779faaaeba
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/util/Macros.h
View File

@ -954,8 +954,8 @@ namespace Eigen {
# define EIGEN_CATCH(X) catch (X) # define EIGEN_CATCH(X) catch (X)
#else #else
# ifdef __CUDA_ARCH__ # ifdef __CUDA_ARCH__
# define EIGEN_THROW_X(X) asm("trap;") return {} # define EIGEN_THROW_X(X) asm("trap;")
# define EIGEN_THROW asm("trap;"); return {} # define EIGEN_THROW asm("trap;")
# else # else
# define EIGEN_THROW_X(X) std::abort() # define EIGEN_THROW_X(X) std::abort()
# define EIGEN_THROW std::abort() # define EIGEN_THROW std::abort()

3
Eigen/src/Core/util/Memory.h
View File

@ -275,6 +275,7 @@ template<typename T> EIGEN_DEVICE_FUNC inline T* construct_elements_of_array(T *
destruct_elements_of_array(ptr, i); destruct_elements_of_array(ptr, i);
EIGEN_THROW; EIGEN_THROW;
} }
return NULL;
} }
/***************************************************************************** /*****************************************************************************
@ -305,6 +306,7 @@ template<typename T> EIGEN_DEVICE_FUNC inline T* aligned_new(size_t size)
aligned_free(result); aligned_free(result);
EIGEN_THROW; EIGEN_THROW;
} }
return result;
} }
template<typename T, bool Align> EIGEN_DEVICE_FUNC inline T* conditional_aligned_new(size_t size) template<typename T, bool Align> EIGEN_DEVICE_FUNC inline T* conditional_aligned_new(size_t size)
@ -320,6 +322,7 @@ template<typename T, bool Align> EIGEN_DEVICE_FUNC inline T* conditional_aligned
conditional_aligned_free<Align>(result); conditional_aligned_free<Align>(result);
EIGEN_THROW; EIGEN_THROW;
} }
return result;
} }
/** \internal Deletes objects constructed with aligned_new /** \internal Deletes objects constructed with aligned_new