Группа :: Разработка/C++
Пакет: eigen2
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: eigen_ftbfs.patch
Скачать
Скачать
diff -rupN eigen-eigen-b23437e61a07/doc/CMakeLists.txt eigen-eigen-b23437e61a07-new/doc/CMakeLists.txt
--- eigen-eigen-b23437e61a07/doc/CMakeLists.txt 2011-12-06 14:18:54.000000000 +0100
+++ eigen-eigen-b23437e61a07-new/doc/CMakeLists.txt 2016-12-17 18:16:35.448684674 +0100
@@ -39,7 +39,6 @@ add_custom_target(
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Eigen_Silly_Professor_64x64.png
${CMAKE_CURRENT_BINARY_DIR}/html/
COMMAND doxygen
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cleanhierarchy.sh ${CMAKE_CURRENT_BINARY_DIR}/html/hierarchy.html
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
diff -rupN eigen-eigen-b23437e61a07/Eigen/src/Core/arch/AltiVec/PacketMath.h eigen-eigen-b23437e61a07-new/Eigen/src/Core/arch/AltiVec/PacketMath.h
--- eigen-eigen-b23437e61a07/Eigen/src/Core/arch/AltiVec/PacketMath.h 2011-12-06 14:18:54.000000000 +0100
+++ eigen-eigen-b23437e61a07-new/Eigen/src/Core/arch/AltiVec/PacketMath.h 2016-12-17 18:17:56.357382621 +0100
@@ -191,7 +191,7 @@ template<> inline v4i ei_ploadu(const
template<> inline v4f ei_pset1(const float& from)
{
// Taken from http://developer.apple.com/hardwaredrivers/ve/alignment.html
- float __attribute__(aligned(16)) af[4];
+ float __attribute__((aligned(16))) af[4];
af[0] = from;
v4f vc = vec_ld(0, af);
vc = vec_splat(vc, 0);
@@ -200,7 +200,7 @@ template<> inline v4f ei_pset1(const fl
template<> inline v4i ei_pset1(const int& from)
{
- int __attribute__(aligned(16)) ai[4];
+ int __attribute__((aligned(16))) ai[4];
ai[0] = from;
v4i vc = vec_ld(0, ai);
vc = vec_splat(vc, 0);
@@ -248,14 +248,14 @@ template<> inline void ei_pstoreu(int*
template<> inline float ei_pfirst(const v4f& a)
{
- float __attribute__(aligned(16)) af[4];
+ float __attribute__((aligned(16))) af[4];
vec_st(a, 0, af);
return af[0];
}
template<> inline int ei_pfirst(const v4i& a)
{
- int __attribute__(aligned(16)) ai[4];
+ int __attribute__((aligned(16))) ai[4];
vec_st(a, 0, ai);
return ai[0];
}
diff -rupN eigen-eigen-b23437e61a07/Eigen/src/Sparse/AmbiVector.h eigen-eigen-b23437e61a07-new/Eigen/src/Sparse/AmbiVector.h
--- eigen-eigen-b23437e61a07/Eigen/src/Sparse/AmbiVector.h 2011-12-06 14:18:54.000000000 +0100
+++ eigen-eigen-b23437e61a07-new/Eigen/src/Sparse/AmbiVector.h 2016-12-17 18:16:35.450684666 +0100
@@ -44,7 +44,7 @@ template<typename _Scalar> class AmbiVec
void init(RealScalar estimatedDensity);
void init(int mode);
- void nonZeros() const;
+ int nonZeros() const;
/** Specifies a sub-vector to work on */
void setBounds(int start, int end) { m_start = start; m_end = end; }
@@ -133,7 +133,7 @@ template<typename _Scalar> class AmbiVec
/** \returns the number of non zeros in the current sub vector */
template<typename Scalar>
-void AmbiVector<Scalar>::nonZeros() const
+int AmbiVector<Scalar>::nonZeros() const
{
if (m_mode==IsSparse)
return m_llSize;