Browse Source

Removed all mentions of EIGEN_DEPRECATED from Eigen Sources. Each instance triggers an error about an unexpected attribute "deprecated". It seems to be a combination of Eigen + Storm or other 3rd party libraries since this error does not apprear in stand-alone compilations with Eigen3.

Former-commit-id: 994758be28
main
PBerger 9 years ago
parent
commit
4e1019e682
  1. 1
      resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/DenseBase.h
  2. 1
      resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/functors/BinaryFunctors.h
  3. 16
      resources/3rdparty/eigen-3.3-beta1/Eigen/src/SparseCore/SparseVector.h
  4. 14
      resources/3rdparty/eigen-3.3-beta1/unsupported/Eigen/src/SparseExtra/DynamicSparseMatrix.h

1
resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/DenseBase.h

@ -312,7 +312,6 @@ template<typename Derived> class DenseBase
/** \deprecated it now returns \c *this */ /** \deprecated it now returns \c *this */
template<unsigned int Added,unsigned int Removed> template<unsigned int Added,unsigned int Removed>
EIGEN_DEPRECATED
const Derived& flagged() const const Derived& flagged() const
{ return derived(); } { return derived(); }

1
resources/3rdparty/eigen-3.3-beta1/Eigen/src/Core/functors/BinaryFunctors.h

@ -46,7 +46,6 @@ struct functor_traits<scalar_sum_op<Scalar> > {
* \sa DenseBase::count(), DenseBase::any(), ArrayBase::cast(), MatrixBase::cast() * \sa DenseBase::count(), DenseBase::any(), ArrayBase::cast(), MatrixBase::cast()
*/ */
template<> struct scalar_sum_op<bool> : scalar_sum_op<int> { template<> struct scalar_sum_op<bool> : scalar_sum_op<int> {
EIGEN_DEPRECATED
scalar_sum_op() {} scalar_sum_op() {}
}; };

16
resources/3rdparty/eigen-3.3-beta1/Eigen/src/SparseCore/SparseVector.h

@ -306,47 +306,47 @@ class SparseVector
public: public:
/** \internal \deprecated use setZero() and reserve() */ /** \internal \deprecated use setZero() and reserve() */
EIGEN_DEPRECATED void startFill(Index reserve)
void startFill(Index reserve)
{ {
setZero(); setZero();
m_data.reserve(reserve); m_data.reserve(reserve);
} }
/** \internal \deprecated use insertBack(Index,Index) */ /** \internal \deprecated use insertBack(Index,Index) */
EIGEN_DEPRECATED Scalar& fill(Index r, Index c)
Scalar& fill(Index r, Index c)
{ {
eigen_assert(r==0 || c==0); eigen_assert(r==0 || c==0);
return fill(IsColVector ? r : c); return fill(IsColVector ? r : c);
} }
/** \internal \deprecated use insertBack(Index) */ /** \internal \deprecated use insertBack(Index) */
EIGEN_DEPRECATED Scalar& fill(Index i)
Scalar& fill(Index i)
{ {
m_data.append(0, i); m_data.append(0, i);
return m_data.value(m_data.size()-1); return m_data.value(m_data.size()-1);
} }
/** \internal \deprecated use insert(Index,Index) */ /** \internal \deprecated use insert(Index,Index) */
EIGEN_DEPRECATED Scalar& fillrand(Index r, Index c)
Scalar& fillrand(Index r, Index c)
{ {
eigen_assert(r==0 || c==0); eigen_assert(r==0 || c==0);
return fillrand(IsColVector ? r : c); return fillrand(IsColVector ? r : c);
} }
/** \internal \deprecated use insert(Index) */ /** \internal \deprecated use insert(Index) */
EIGEN_DEPRECATED Scalar& fillrand(Index i)
Scalar& fillrand(Index i)
{ {
return insert(i); return insert(i);
} }
/** \internal \deprecated use finalize() */ /** \internal \deprecated use finalize() */
EIGEN_DEPRECATED void endFill() {}
void endFill() {}
// These two functions were here in the 3.1 release, so let's keep them in case some code rely on them. // These two functions were here in the 3.1 release, so let's keep them in case some code rely on them.
/** \internal \deprecated use data() */ /** \internal \deprecated use data() */
EIGEN_DEPRECATED Storage& _data() { return m_data; }
Storage& _data() { return m_data; }
/** \internal \deprecated use data() */ /** \internal \deprecated use data() */
EIGEN_DEPRECATED const Storage& _data() const { return m_data; }
const Storage& _data() const { return m_data; }
# ifdef EIGEN_SPARSEVECTOR_PLUGIN # ifdef EIGEN_SPARSEVECTOR_PLUGIN
# include EIGEN_SPARSEVECTOR_PLUGIN # include EIGEN_SPARSEVECTOR_PLUGIN

14
resources/3rdparty/eigen-3.3-beta1/unsupported/Eigen/src/SparseExtra/DynamicSparseMatrix.h

@ -225,14 +225,14 @@ template<typename _Scalar, int _Options, typename _StorageIndex>
} }
/** The class DynamicSparseMatrix is deprectaed */ /** The class DynamicSparseMatrix is deprectaed */
EIGEN_DEPRECATED inline DynamicSparseMatrix()
inline DynamicSparseMatrix()
: m_innerSize(0), m_data(0) : m_innerSize(0), m_data(0)
{ {
eigen_assert(innerSize()==0 && outerSize()==0); eigen_assert(innerSize()==0 && outerSize()==0);
} }
/** The class DynamicSparseMatrix is deprectaed */ /** The class DynamicSparseMatrix is deprectaed */
EIGEN_DEPRECATED inline DynamicSparseMatrix(Index rows, Index cols)
inline DynamicSparseMatrix(Index rows, Index cols)
: m_innerSize(0) : m_innerSize(0)
{ {
resize(rows, cols); resize(rows, cols);
@ -240,7 +240,7 @@ template<typename _Scalar, int _Options, typename _StorageIndex>
/** The class DynamicSparseMatrix is deprectaed */ /** The class DynamicSparseMatrix is deprectaed */
template<typename OtherDerived> template<typename OtherDerived>
EIGEN_DEPRECATED explicit inline DynamicSparseMatrix(const SparseMatrixBase<OtherDerived>& other)
explicit inline DynamicSparseMatrix(const SparseMatrixBase<OtherDerived>& other)
: m_innerSize(0) : m_innerSize(0)
{ {
Base::operator=(other.derived()); Base::operator=(other.derived());
@ -281,7 +281,7 @@ template<typename _Scalar, int _Options, typename _StorageIndex>
/** \deprecated /** \deprecated
* Set the matrix to zero and reserve the memory for \a reserveSize nonzero coefficients. */ * Set the matrix to zero and reserve the memory for \a reserveSize nonzero coefficients. */
EIGEN_DEPRECATED void startFill(Index reserveSize = 1000)
void startFill(Index reserveSize = 1000)
{ {
setZero(); setZero();
reserve(reserveSize); reserve(reserveSize);
@ -296,7 +296,7 @@ template<typename _Scalar, int _Options, typename _StorageIndex>
* *
* \see fillrand(), coeffRef() * \see fillrand(), coeffRef()
*/ */
EIGEN_DEPRECATED Scalar& fill(Index row, Index col)
Scalar& fill(Index row, Index col)
{ {
const Index outer = IsRowMajor ? row : col; const Index outer = IsRowMajor ? row : col;
const Index inner = IsRowMajor ? col : row; const Index inner = IsRowMajor ? col : row;
@ -308,14 +308,14 @@ template<typename _Scalar, int _Options, typename _StorageIndex>
* Compared to the generic coeffRef(), the unique limitation is that we assume * Compared to the generic coeffRef(), the unique limitation is that we assume
* the coefficient does not exist yet. * the coefficient does not exist yet.
*/ */
EIGEN_DEPRECATED Scalar& fillrand(Index row, Index col)
Scalar& fillrand(Index row, Index col)
{ {
return insert(row,col); return insert(row,col);
} }
/** \deprecated use finalize() /** \deprecated use finalize()
* Does nothing. Provided for compatibility with SparseMatrix. */ * Does nothing. Provided for compatibility with SparseMatrix. */
EIGEN_DEPRECATED void endFill() {}
void endFill() {}
# ifdef EIGEN_DYNAMICSPARSEMATRIX_PLUGIN # ifdef EIGEN_DYNAMICSPARSEMATRIX_PLUGIN
# include EIGEN_DYNAMICSPARSEMATRIX_PLUGIN # include EIGEN_DYNAMICSPARSEMATRIX_PLUGIN

Loading…
Cancel
Save