GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-30 15:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed the ordering of the template and EIGEN_DEVICE_FUNC keywords in a few more places to get more of the Eigen codebase to compile with nvcc again.

Browse Source
This commit is contained in:
Benoit Steiner 2017-02-01 15:41:29 -08:00
parent fcd257039b
commit 2db75c07a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/plugins/BlockMethods.h
View File

@ -439,8 +439,8 @@ EIGEN_DOC_BLOCK_ADDONS_NOT_INNER_PANEL
/// ///
/// \sa block(Index,Index,NRowsType,NColsType), class Block /// \sa block(Index,Index,NRowsType,NColsType), class Block
/// ///
EIGEN_DEVICE_FUNC
template<typename NRowsType, typename NColsType> template<typename NRowsType, typename NColsType>
EIGEN_DEVICE_FUNC
#ifndef EIGEN_PARSED_BY_DOXYGEN #ifndef EIGEN_PARSED_BY_DOXYGEN
inline typename FixedBlockXpr<internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value>::Type inline typename FixedBlockXpr<internal::get_fixed_value<NRowsType>::value,internal::get_fixed_value<NColsType>::value>::Type
#else #else
@ -544,8 +544,8 @@ EIGEN_DOC_BLOCK_ADDONS_INNER_PANEL_IF(row-major)
/// ///
/// \sa block(Index,Index,NRowsType,NColsType), class Block /// \sa block(Index,Index,NRowsType,NColsType), class Block
/// ///
EIGEN_DEVICE_FUNC
template<typename NRowsType> template<typename NRowsType>
EIGEN_DEVICE_FUNC
#ifndef EIGEN_PARSED_BY_DOXYGEN #ifndef EIGEN_PARSED_BY_DOXYGEN
inline typename NRowsBlockXpr<internal::get_fixed_value<NRowsType>::value>::Type inline typename NRowsBlockXpr<internal::get_fixed_value<NRowsType>::value>::Type
#else #else
@ -695,8 +695,8 @@ EIGEN_DOC_BLOCK_ADDONS_INNER_PANEL_IF(row-major)
/// ///
/// \sa block(Index,Index,NRowsType,NColsType), class Block /// \sa block(Index,Index,NRowsType,NColsType), class Block
/// ///
EIGEN_DEVICE_FUNC
template<typename NRowsType> template<typename NRowsType>
EIGEN_DEVICE_FUNC
#ifndef EIGEN_PARSED_BY_DOXYGEN #ifndef EIGEN_PARSED_BY_DOXYGEN
inline typename NRowsBlockXpr<internal::get_fixed_value<NRowsType>::value>::Type inline typename NRowsBlockXpr<internal::get_fixed_value<NRowsType>::value>::Type
#else #else
@ -860,8 +860,8 @@ rightCols(NColsType n)
} }
/// This is the const version of rightCols(NColsType). /// This is the const version of rightCols(NColsType).
EIGEN_DEVICE_FUNC
template<typename NColsType> template<typename NColsType>
EIGEN_DEVICE_FUNC
#ifndef EIGEN_PARSED_BY_DOXYGEN #ifndef EIGEN_PARSED_BY_DOXYGEN
inline const typename ConstNColsBlockXpr<internal::get_fixed_value<NColsType>::value>::Type inline const typename ConstNColsBlockXpr<internal::get_fixed_value<NColsType>::value>::Type
#else #else
@ -1229,8 +1229,8 @@ head(NType n) const
/// ///
/// \sa class Block, block(Index,Index) /// \sa class Block, block(Index,Index)
/// ///
EIGEN_DEVICE_FUNC
template<typename NType> template<typename NType>
EIGEN_DEVICE_FUNC
#ifndef EIGEN_PARSED_BY_DOXYGEN #ifndef EIGEN_PARSED_BY_DOXYGEN
inline typename FixedSegmentReturnType<internal::get_fixed_value<NType>::value>::Type inline typename FixedSegmentReturnType<internal::get_fixed_value<NType>::value>::Type
#else #else