[mlpack-svn] r11830 - mlpack/trunk/src/mlpack/core/arma_extend/sparse
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Mar 12 15:19:22 EDT 2012
Author: rcurtin
Date: 2012-03-12 15:19:22 -0400 (Mon, 12 Mar 2012)
New Revision: 11830
Modified:
mlpack/trunk/src/mlpack/core/arma_extend/sparse/SpMat_meat.hpp
Log:
More typenames, required by VS2010 but not by GCC (for some reason).
Modified: mlpack/trunk/src/mlpack/core/arma_extend/sparse/SpMat_meat.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/sparse/SpMat_meat.hpp 2012-03-12 19:18:17 UTC (rev 11829)
+++ mlpack/trunk/src/mlpack/core/arma_extend/sparse/SpMat_meat.hpp 2012-03-12 19:19:22 UTC (rev 11830)
@@ -66,7 +66,7 @@
template<typename eT>
inline
-SpMat<eT>::iterator::iterator(const SpMat<eT>::iterator& other)
+SpMat<eT>::iterator::iterator(const typename SpMat<eT>::iterator& other)
: M(other.M)
, row(other.row)
, col(other.col)
@@ -181,7 +181,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator!=(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::iterator::operator!=(const typename SpMat<eT>::iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -189,7 +189,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator!=(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::iterator::operator!=(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -197,7 +197,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator!=(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::iterator::operator!=(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -205,7 +205,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator!=(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::iterator::operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -213,7 +213,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator==(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::iterator::operator==(const typename SpMat<eT>::iterator& rhs) const
{
arma_extra_debug_sigprint();
@@ -223,7 +223,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator==(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::iterator::operator==(const typename SpMat<eT>::const_iterator& rhs) const
{
arma_extra_debug_sigprint();
@@ -233,7 +233,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator==(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::iterator::operator==(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -241,7 +241,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::iterator::operator==(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::iterator::operator==(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -301,7 +301,7 @@
template<typename eT>
inline
-SpMat<eT>::const_iterator::const_iterator(const SpMat<eT>::const_iterator& other)
+SpMat<eT>::const_iterator::const_iterator(const typename SpMat<eT>::const_iterator& other)
: M(other.M)
, row(other.row)
, col(other.col)
@@ -312,7 +312,7 @@
template<typename eT>
inline
-SpMat<eT>::const_iterator::const_iterator(const SpMat<eT>::iterator& other)
+SpMat<eT>::const_iterator::const_iterator(const typename SpMat<eT>::iterator& other)
: M(other.M)
, row(other.row)
, col(other.col)
@@ -427,7 +427,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator!=(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::const_iterator::operator!=(const typename SpMat<eT>::iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -435,7 +435,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator!=(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::const_iterator::operator!=(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -443,7 +443,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator!=(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::const_iterator::operator!=(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -451,7 +451,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator!=(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::const_iterator::operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -459,7 +459,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator==(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::const_iterator::operator==(const typename SpMat<eT>::iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -467,7 +467,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator==(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::const_iterator::operator==(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -475,7 +475,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator==(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::const_iterator::operator==(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -483,7 +483,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_iterator::operator==(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::const_iterator::operator==(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -591,7 +591,7 @@
*/
template<typename eT>
inline
-SpMat<eT>::row_iterator::row_iterator(const SpMat<eT>::row_iterator& other)
+SpMat<eT>::row_iterator::row_iterator(const typename SpMat<eT>::row_iterator& other)
: M(other.M)
, row(other.row)
, col(other.col)
@@ -825,7 +825,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator!=(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::row_iterator::operator!=(const typename SpMat<eT>::iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -833,7 +833,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator!=(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::row_iterator::operator!=(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -841,7 +841,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator!=(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::row_iterator::operator!=(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -849,7 +849,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator!=(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::row_iterator::operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -860,7 +860,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator==(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::row_iterator::operator==(const typename SpMat<eT>::iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -868,7 +868,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator==(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::row_iterator::operator==(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -876,7 +876,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator==(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::row_iterator::operator==(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -884,7 +884,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::row_iterator::operator==(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::row_iterator::operator==(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -995,7 +995,7 @@
*/
template<typename eT>
inline
-SpMat<eT>::const_row_iterator::const_row_iterator(const SpMat<eT>::const_row_iterator& other)
+SpMat<eT>::const_row_iterator::const_row_iterator(const typename SpMat<eT>::const_row_iterator& other)
: M(other.M)
, row(other.row)
, col(other.col)
@@ -1009,7 +1009,7 @@
*/
template<typename eT>
inline
-SpMat<eT>::const_row_iterator::const_row_iterator(const SpMat<eT>::row_iterator& other)
+SpMat<eT>::const_row_iterator::const_row_iterator(const typename SpMat<eT>::row_iterator& other)
: M(other.M)
, row(other.row)
, col(other.col)
@@ -1243,7 +1243,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator!=(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -1251,7 +1251,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator!=(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -1259,7 +1259,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator!=(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -1267,7 +1267,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator!=(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator!=(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row != rhs.row) || (col != rhs.col));
}
@@ -1278,7 +1278,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator==(const SpMat<eT>::iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator==(const typename SpMat<eT>::iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -1286,7 +1286,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator==(const SpMat<eT>::const_iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator==(const typename SpMat<eT>::const_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -1294,7 +1294,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator==(const SpMat<eT>::row_iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator==(const typename SpMat<eT>::row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
@@ -1302,7 +1302,7 @@
template<typename eT>
inline
bool
-SpMat<eT>::const_row_iterator::operator==(const SpMat<eT>::const_row_iterator& rhs) const
+SpMat<eT>::const_row_iterator::operator==(const typename SpMat<eT>::const_row_iterator& rhs) const
{
return ((row == rhs.row) && (col == rhs.col));
}
More information about the mlpack-svn
mailing list