Initial fixes for bug #85.

Renamed meta_{true|false} to {true|false}_type, meta_if to conditional, is_same_type to is_same, un{ref|pointer|const} to remove_{reference|pointer|const} and makeconst to add_const.
Changed boolean type 'ret' member to 'value'.
Changed 'ret' members refering to types to 'type'.
Adapted all code occurences.
This commit is contained in:
Hauke Heibel
2010-10-25 22:13:49 +02:00
parent 597b2745e1
commit 7bc8e3ac09
78 changed files with 293 additions and 293 deletions

View File

@@ -30,22 +30,22 @@ namespace internal {
template<typename Scalar, typename CholmodType>
void cholmod_configure_matrix(CholmodType& mat)
{
if (is_same_type<Scalar,float>::ret)
if (is_same<Scalar,float>::value)
{
mat.xtype = CHOLMOD_REAL;
mat.dtype = CHOLMOD_SINGLE;
}
else if (is_same_type<Scalar,double>::ret)
else if (is_same<Scalar,double>::value)
{
mat.xtype = CHOLMOD_REAL;
mat.dtype = CHOLMOD_DOUBLE;
}
else if (is_same_type<Scalar,std::complex<float> >::ret)
else if (is_same<Scalar,std::complex<float> >::value)
{
mat.xtype = CHOLMOD_COMPLEX;
mat.dtype = CHOLMOD_SINGLE;
}
else if (is_same_type<Scalar,std::complex<double> >::ret)
else if (is_same<Scalar,std::complex<double> >::value)
{
mat.xtype = CHOLMOD_COMPLEX;
mat.dtype = CHOLMOD_DOUBLE;

View File

@@ -134,13 +134,13 @@ struct SluMatrix : SuperMatrix
template<typename Scalar>
void setScalarType()
{
if (internal::is_same_type<Scalar,float>::ret)
if (internal::is_same<Scalar,float>::value)
Dtype = SLU_S;
else if (internal::is_same_type<Scalar,double>::ret)
else if (internal::is_same<Scalar,double>::value)
Dtype = SLU_D;
else if (internal::is_same_type<Scalar,std::complex<float> >::ret)
else if (internal::is_same<Scalar,std::complex<float> >::value)
Dtype = SLU_C;
else if (internal::is_same_type<Scalar,std::complex<double> >::ret)
else if (internal::is_same<Scalar,std::complex<double> >::value)
Dtype = SLU_Z;
else
{