Fixed some compilation problems with nvcc + clang

This commit is contained in:
Benoit Steiner 2016-01-27 15:37:03 -08:00
parent 47ca9dc809
commit 291069e885
2 changed files with 5 additions and 5 deletions

View File

@ -526,9 +526,9 @@ template<typename T, bool Align> EIGEN_DEVICE_FUNC inline void conditional_align
template<int Alignment, typename Scalar, typename Index>
EIGEN_DEVICE_FUNC inline Index first_aligned(const Scalar* array, Index size)
{
static const Index ScalarSize = sizeof(Scalar);
static const Index AlignmentSize = Alignment / ScalarSize;
static const Index AlignmentMask = AlignmentSize-1;
const Index ScalarSize = sizeof(Scalar);
const Index AlignmentSize = Alignment / ScalarSize;
const Index AlignmentMask = AlignmentSize-1;
if(AlignmentSize<=1)
{

View File

@ -346,7 +346,7 @@ struct InnerReducer {
static const bool HasOptimizedImplementation = false;
static void run(const Self&, Op&, const Device&, typename Self::CoeffReturnType*, typename Self::Index, typename Self::Index) {
assert(false && "Not implemented");
eigen_assert(false && "Not implemented");
}
};
@ -356,7 +356,7 @@ struct OuterReducer {
static const bool HasOptimizedImplementation = false;
static void run(const Self&, Op&, const Device&, typename Self::CoeffReturnType*, typename Self::Index, typename Self::Index) {
assert(false && "Not implemented");
eigen_assert(false && "Not implemented");
}
};