Merged in ezhulenev/eigen-01 (pull request PR-632)

Fix doxygen warnings
This commit is contained in:
Gael Guennebaud 2019-04-25 20:02:20 +00:00
commit 665ac22cc6
6 changed files with 19 additions and 14 deletions

View File

@ -302,17 +302,17 @@ template<typename Derived> class DenseBase
Derived& operator=(const ReturnByValue<OtherDerived>& func); Derived& operator=(const ReturnByValue<OtherDerived>& func);
/** \internal /** \internal
* Copies \a other into *this without evaluating other. \returns a reference to *this. * Copies \a other into *this without evaluating other. \returns a reference to *this. */
* \deprecated */
template<typename OtherDerived> template<typename OtherDerived>
/** \deprecated */
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
Derived& lazyAssign(const DenseBase<OtherDerived>& other); Derived& lazyAssign(const DenseBase<OtherDerived>& other);
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
CommaInitializer<Derived> operator<< (const Scalar& s); CommaInitializer<Derived> operator<< (const Scalar& s);
/** \deprecated it now returns \c *this */
template<unsigned int Added,unsigned int Removed> template<unsigned int Added,unsigned int Removed>
/** \deprecated it now returns \c *this */
EIGEN_DEPRECATED EIGEN_DEPRECATED
const Derived& flagged() const const Derived& flagged() const
{ return derived(); } { return derived(); }

View File

@ -22,7 +22,8 @@ template<typename T> struct add_const_on_value_type_if_arithmetic
/** \brief Base class providing read-only coefficient access to matrices and arrays. /** \brief Base class providing read-only coefficient access to matrices and arrays.
* \ingroup Core_Module * \ingroup Core_Module
* \tparam Derived Type of the derived class * \tparam Derived Type of the derived class
* \tparam #ReadOnlyAccessors Constant indicating read-only access *
* \note #ReadOnlyAccessors Constant indicating read-only access
* *
* This class defines the \c operator() \c const function and friends, which can be used to read specific * This class defines the \c operator() \c const function and friends, which can be used to read specific
* entries of a matrix or array. * entries of a matrix or array.
@ -288,7 +289,8 @@ class DenseCoeffsBase<Derived,ReadOnlyAccessors> : public EigenBase<Derived>
/** \brief Base class providing read/write coefficient access to matrices and arrays. /** \brief Base class providing read/write coefficient access to matrices and arrays.
* \ingroup Core_Module * \ingroup Core_Module
* \tparam Derived Type of the derived class * \tparam Derived Type of the derived class
* \tparam #WriteAccessors Constant indicating read/write access *
* \note #WriteAccessors Constant indicating read/write access
* *
* This class defines the non-const \c operator() function and friends, which can be used to write specific * This class defines the non-const \c operator() function and friends, which can be used to write specific
* entries of a matrix or array. This class inherits DenseCoeffsBase<Derived, ReadOnlyAccessors> which * entries of a matrix or array. This class inherits DenseCoeffsBase<Derived, ReadOnlyAccessors> which
@ -466,7 +468,8 @@ class DenseCoeffsBase<Derived, WriteAccessors> : public DenseCoeffsBase<Derived,
/** \brief Base class providing direct read-only coefficient access to matrices and arrays. /** \brief Base class providing direct read-only coefficient access to matrices and arrays.
* \ingroup Core_Module * \ingroup Core_Module
* \tparam Derived Type of the derived class * \tparam Derived Type of the derived class
* \tparam #DirectAccessors Constant indicating direct access *
* \note #DirectAccessors Constant indicating direct access
* *
* This class defines functions to work with strides which can be used to access entries directly. This class * This class defines functions to work with strides which can be used to access entries directly. This class
* inherits DenseCoeffsBase<Derived, ReadOnlyAccessors> which defines functions to access entries read-only using * inherits DenseCoeffsBase<Derived, ReadOnlyAccessors> which defines functions to access entries read-only using
@ -539,7 +542,8 @@ class DenseCoeffsBase<Derived, DirectAccessors> : public DenseCoeffsBase<Derived
/** \brief Base class providing direct read/write coefficient access to matrices and arrays. /** \brief Base class providing direct read/write coefficient access to matrices and arrays.
* \ingroup Core_Module * \ingroup Core_Module
* \tparam Derived Type of the derived class * \tparam Derived Type of the derived class
* \tparam #DirectWriteAccessors Constant indicating direct access *
* \note #DirectWriteAccessors Constant indicating direct access
* *
* This class defines functions to work with strides which can be used to access entries directly. This class * This class defines functions to work with strides which can be used to access entries directly. This class
* inherits DenseCoeffsBase<Derived, WriteAccessors> which defines functions to access entries read/write using * inherits DenseCoeffsBase<Derived, WriteAccessors> which defines functions to access entries read/write using

View File

@ -32,8 +32,9 @@ template<typename Derived> struct EigenBase
/** \brief The interface type of indices /** \brief The interface type of indices
* \details To change this, \c \#define the preprocessor symbol \c EIGEN_DEFAULT_DENSE_INDEX_TYPE. * \details To change this, \c \#define the preprocessor symbol \c EIGEN_DEFAULT_DENSE_INDEX_TYPE.
* \deprecated Since Eigen 3.3, its usage is deprecated. Use Eigen::Index instead.
* \sa StorageIndex, \ref TopicPreprocessorDirectives. * \sa StorageIndex, \ref TopicPreprocessorDirectives.
* DEPRECATED: Since Eigen 3.3, its usage is deprecated. Use Eigen::Index instead.
* Deprecation is not marked with a doxygen comment because there are too many existing usages to add the deprecation attribute.
*/ */
typedef Eigen::Index Index; typedef Eigen::Index Index;

View File

@ -449,13 +449,13 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularViewImpl<_Mat
TriangularViewType& operator=(const TriangularViewImpl& other) TriangularViewType& operator=(const TriangularViewImpl& other)
{ return *this = other.derived().nestedExpression(); } { return *this = other.derived().nestedExpression(); }
/** \deprecated */
template<typename OtherDerived> template<typename OtherDerived>
/** \deprecated */
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
void lazyAssign(const TriangularBase<OtherDerived>& other); void lazyAssign(const TriangularBase<OtherDerived>& other);
/** \deprecated */
template<typename OtherDerived> template<typename OtherDerived>
/** \deprecated */
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
void lazyAssign(const MatrixBase<OtherDerived>& other); void lazyAssign(const MatrixBase<OtherDerived>& other);
#endif #endif
@ -536,9 +536,9 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularViewImpl<_Mat
call_assignment(derived(), other.const_cast_derived(), internal::swap_assign_op<Scalar>()); call_assignment(derived(), other.const_cast_derived(), internal::swap_assign_op<Scalar>());
} }
/** \deprecated /** Shortcut for \code (*this).swap(other.triangularView<(*this)::Mode>()) \endcode */
* Shortcut for \code (*this).swap(other.triangularView<(*this)::Mode>()) \endcode */
template<typename OtherDerived> template<typename OtherDerived>
/** \deprecated */
EIGEN_DEPRECATED EIGEN_DEVICE_FUNC EIGEN_DEPRECATED EIGEN_DEVICE_FUNC
void swap(MatrixBase<OtherDerived> const & other) void swap(MatrixBase<OtherDerived> const & other)
{ {

View File

@ -314,9 +314,9 @@ polygamma(const EIGEN_CURRENT_STORAGE_BASE_CLASS<DerivedN> &n) const
* *
* It returns the Riemann zeta function of two arguments \c *this and \a q: * It returns the Riemann zeta function of two arguments \c *this and \a q:
* *
* \param *this is the exponent, it must be > 1
* \param q is the shift, it must be > 0 * \param q is the shift, it must be > 0
* *
* \note *this is the exponent, it must be > 1.
* \note This function supports only float and double scalar types. To support other scalar types, the user has * \note This function supports only float and double scalar types. To support other scalar types, the user has
* to provide implementations of zeta(T,T) for any scalar type T to be supported. * to provide implementations of zeta(T,T) for any scalar type T to be supported.
* *

View File

@ -143,7 +143,7 @@ betainc(const Eigen::ArrayBase<ArgADerived>& a, const Eigen::ArrayBase<ArgBDeriv
* *
* It returns the Riemann zeta function of two arguments \a x and \a q: * It returns the Riemann zeta function of two arguments \a x and \a q:
* *
* \param x is the exposent, it must be > 1 * \param x is the exponent, it must be > 1
* \param q is the shift, it must be > 0 * \param q is the shift, it must be > 0
* *
* \note This function supports only float and double scalar types. To support other scalar types, the user has * \note This function supports only float and double scalar types. To support other scalar types, the user has