fix a dozen of warnings with MSVC, and get rid of some useless throw()

This commit is contained in:
Gael Guennebaud
2012-02-06 15:57:51 +01:00
parent 6ad48c5d92
commit 99c694623a
6 changed files with 20 additions and 26 deletions

View File

@@ -177,10 +177,8 @@ template<int Side, typename OtherDerived>
void TriangularView<MatrixType,Mode>::solveInPlace(const MatrixBase<OtherDerived>& _other) const
{
OtherDerived& other = _other.const_cast_derived();
eigen_assert(cols() == rows());
eigen_assert( (Side==OnTheLeft && cols() == other.rows()) || (Side==OnTheRight && cols() == other.cols()) );
eigen_assert(!(Mode & ZeroDiag));
eigen_assert(Mode & (Upper|Lower));
eigen_assert( cols() == rows() && ((Side==OnTheLeft && cols() == other.rows()) || (Side==OnTheRight && cols() == other.cols())) );
eigen_assert((!(Mode & ZeroDiag)) && bool(Mode & (Upper|Lower)));
enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit && OtherDerived::IsVectorAtCompileTime };
typedef typename internal::conditional<copy,

View File

@@ -640,7 +640,7 @@ template<typename T> class aligned_stack_memory_handler
#define EIGEN_MAKE_ALIGNED_OPERATOR_NEW EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(true)
#define EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(Scalar,Size) \
EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(((Size)!=Eigen::Dynamic) && ((sizeof(Scalar)*(Size))%16==0))
EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(bool(((Size)!=Eigen::Dynamic) && ((sizeof(Scalar)*(Size))%16==0)))
/****************************************************************************/
@@ -688,24 +688,24 @@ public:
return &value;
}
aligned_allocator() throw( )
aligned_allocator()
{
}
aligned_allocator( const aligned_allocator& ) throw( )
aligned_allocator( const aligned_allocator& )
{
}
template<class U>
aligned_allocator( const aligned_allocator<U>& ) throw( )
aligned_allocator( const aligned_allocator<U>& )
{
}
~aligned_allocator() throw( )
~aligned_allocator()
{
}
size_type max_size() const throw( )
size_type max_size() const
{
return (std::numeric_limits<size_type>::max)();
}