The intrin.h header needs to be included after cmath in order to prevent warnigns.

Fixed (hopefully) final Index realted warnings.
This commit is contained in:
Hauke Heibel 2010-06-21 18:39:24 +02:00
parent 80b6e5f278
commit 4bac6fbe1e
3 changed files with 14 additions and 9 deletions

View File

@ -118,10 +118,6 @@
#endif #endif
#endif #endif
#ifdef _MSC_VER
#include <intrin.h> // required for __cpuid
#endif
#if (defined _OPENMP) && (!defined EIGEN_DONT_PARALLELIZE) #if (defined _OPENMP) && (!defined EIGEN_DONT_PARALLELIZE)
#define EIGEN_HAS_OPENMP #define EIGEN_HAS_OPENMP
#endif #endif
@ -148,6 +144,11 @@
#include<iostream> #include<iostream>
#endif #endif
// required for __cpuid, needs to be included after cmath
#ifdef _MSC_VER
#include <intrin.h>
#endif
#if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS) #if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(EIGEN_NO_EXCEPTIONS)
#define EIGEN_EXCEPTIONS #define EIGEN_EXCEPTIONS
#endif #endif

View File

@ -36,11 +36,12 @@ template<typename BoxType> void alignedbox(const BoxType& _box)
AlignedBox.h AlignedBox.h
*/ */
typedef typename BoxType::Index Index; typedef typename BoxType::Index Index;
const Index dim = _box.dim();
typedef typename BoxType::Scalar Scalar; typedef typename BoxType::Scalar Scalar;
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
typedef Matrix<Scalar, BoxType::AmbientDimAtCompileTime, 1> VectorType; typedef Matrix<Scalar, BoxType::AmbientDimAtCompileTime, 1> VectorType;
const Index dim = _box.dim();
VectorType p0 = VectorType::Random(dim); VectorType p0 = VectorType::Random(dim);
VectorType p1 = VectorType::Random(dim); VectorType p1 = VectorType::Random(dim);
while( p1 == p0 ){ while( p1 == p0 ){
@ -83,11 +84,13 @@ template<typename BoxType>
void alignedboxCastTests(const BoxType& _box) void alignedboxCastTests(const BoxType& _box)
{ {
// casting // casting
const int dim = _box.dim(); typedef typename BoxType::Index Index;
typedef typename BoxType::Scalar Scalar; typedef typename BoxType::Scalar Scalar;
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
typedef Matrix<Scalar, BoxType::AmbientDimAtCompileTime, 1> VectorType; typedef Matrix<Scalar, BoxType::AmbientDimAtCompileTime, 1> VectorType;
const Index dim = _box.dim();
VectorType p0 = VectorType::Random(dim); VectorType p0 = VectorType::Random(dim);
VectorType p1 = VectorType::Random(dim); VectorType p1 = VectorType::Random(dim);

View File

@ -26,9 +26,10 @@
template<typename VectorType> void map_class_vector(const VectorType& m) template<typename VectorType> void map_class_vector(const VectorType& m)
{ {
typedef typename VectorType::Index Index;
typedef typename VectorType::Scalar Scalar; typedef typename VectorType::Scalar Scalar;
int size = m.size(); Index size = m.size();
// test Map.h // test Map.h
Scalar* array1 = ei_aligned_new<Scalar>(size); Scalar* array1 = ei_aligned_new<Scalar>(size);