manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the is "inaccessible" issue with g++-4.0.1

This commit is contained in:
Paolo Cignoni 2008-10-29 11:28:51 +00:00
parent e587581275
commit 696f763c3d
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/math/eigen_matrix_addons.h
View File

@ -27,7 +27,7 @@ enum {Dimension = SizeAtCompileTime};
typedef typename ei_to_vcgtype<Matrix>::type EquivVcgType; typedef typename ei_to_vcgtype<Matrix>::type EquivVcgType;
typedef vcg::VoidType ParamType; typedef vcg::VoidType ParamType;
typedef Matrix PointType; typedef Matrix PointType;
// using Base::V; using Base::V;
// automatic conversion to similar vcg types // automatic conversion to similar vcg types
// the otherway round is implicit because they inherits this Matrix tyoe // the otherway round is implicit because they inherits this Matrix tyoe
@ -78,9 +78,6 @@ inline Scalar& W() { return data()[SizeAtCompileTime-1]; }
/** note, W always returns the last entry */ /** note, W always returns the last entry */
inline const Scalar& W() const { return data()[SizeAtCompileTime-1]; } inline const Scalar& W() const { return data()[SizeAtCompileTime-1]; }
EIGEN_DEPRECATED inline Scalar V(int i) const { return (*this)[i]; };
EIGEN_DEPRECATED inline Scalar& V(int i) { return (*this)[i]; };
/** \deprecated use .data() */ /** \deprecated use .data() */
EIGEN_DEPRECATED Scalar* V() { return data(); } EIGEN_DEPRECATED Scalar* V() { return data(); }
/** \deprecated use .data() */ /** \deprecated use .data() */
@ -93,6 +90,8 @@ EIGEN_DEPRECATED inline const Scalar& V( const int i ) const
assert(i>=0 && i<SizeAtCompileTime); assert(i>=0 && i<SizeAtCompileTime);
return data()[i]; return data()[i];
} }
// // redefined because gcc 4.0.1 does not handle using Base::V
// EIGEN_DEPRECATED inline Scalar& V(int i) { return (*this)[i]; };
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// SPACE // SPACE

3
vcg/space/point2.h
View File

@ -63,14 +63,13 @@ public:
//---------------------------------------- //----------------------------------------
private: private:
typedef Eigen::Matrix<_Scalar,2,1> _Base; typedef Eigen::Matrix<_Scalar,2,1> _Base;
public:
using _Base::coeff; using _Base::coeff;
using _Base::coeffRef; using _Base::coeffRef;
using _Base::setZero; using _Base::setZero;
using _Base::data; using _Base::data;
using _Base::V; using _Base::V;
public:
_EIGEN_GENERIC_PUBLIC_INTERFACE(Point2,_Base); _EIGEN_GENERIC_PUBLIC_INTERFACE(Point2,_Base);
VCG_EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Point2) VCG_EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Point2)

3
vcg/space/point3.h
View File

@ -77,8 +77,9 @@ public:
//---------------------------------------- //----------------------------------------
private: private:
typedef Eigen::Matrix<_Scalar,3,1> _Base; typedef Eigen::Matrix<_Scalar,3,1> _Base;
using _Base::Construct;
public: public:
using _Base::Construct;
_EIGEN_GENERIC_PUBLIC_INTERFACE(Point3,_Base); _EIGEN_GENERIC_PUBLIC_INTERFACE(Point3,_Base);
VCG_EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Point3) VCG_EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Point3)

4
vcg/space/point4.h
View File

@ -63,13 +63,11 @@ public:
//---------------------------------------- //----------------------------------------
private: private:
typedef Eigen::Matrix<T,4,1> _Base; typedef Eigen::Matrix<T,4,1> _Base;
public:
using _Base::coeff; using _Base::coeff;
using _Base::coeffRef; using _Base::coeffRef;
using _Base::setZero; using _Base::setZero;
using _Base::data; using _Base::data;
using _Base::V;
public:
_EIGEN_GENERIC_PUBLIC_INTERFACE(Point4,_Base); _EIGEN_GENERIC_PUBLIC_INTERFACE(Point4,_Base);
typedef Scalar ScalarType; typedef Scalar ScalarType;