[mlpack-svn] r17027 - mlpack/trunk/src/mlpack/core/arma_extend

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Thu Aug 14 12:22:42 2014
New Revision: 17027

Log:
Don't add row_col_iterator support after 4.349 (currently svn trunk) since
Conrad accepted our patches.


Modified:
   mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
   mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
   mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
   mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp

Modified: mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp	Thu Aug 14 12:22:42 2014
@@ -8,6 +8,8 @@
  * to sparse matrix iterators.
  */
 
+#if ARMA_VERSION_MAJOR < 4 || \
+    (ARMA_VERSION_MAJOR == 4 && ARMA_VERSION_MINOR < 349)
 class row_col_iterator;
 
 class const_row_col_iterator
@@ -136,3 +138,4 @@
 // end for iterator row_col_iterator
 inline const_row_col_iterator end_row_col() const;
 inline row_col_iterator end_row_col();
+#endif

Modified: mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp	Thu Aug 14 12:22:42 2014
@@ -1,3 +1,5 @@
+#if ARMA_VERSION_MAJOR < 4 || \
+    (ARMA_VERSION_MAJOR == 4 && ARMA_VERSION_MINOR < 349)
 ///////////////////////////////////////////////////////////////////////////////
 // Mat::const_row_col_iterator implementation                                //
 ///////////////////////////////////////////////////////////////////////////////
@@ -471,3 +473,5 @@
   {
   return ++row_col_iterator(*this, n_rows - 1, n_cols - 1);
   }
+
+#endif

Modified: mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp	Thu Aug 14 12:22:42 2014
@@ -19,9 +19,11 @@
 #endif
 
 /*
- * Extra functions for SpMat<eT> 
+ * Extra functions for SpMat<eT>
  * Adding definition of row_col_iterator to generalize with Mat<eT>::row_col_iterator
  */
+#if ARMA_VERSION_MAJOR < 4 || \
+    (ARMA_VERSION_MAJOR == 4 && ARMA_VERSION_MINOR < 349)
 typedef iterator row_col_iterator;
 typedef const_iterator const_row_col_iterator;
 
@@ -32,3 +34,4 @@
 // end for iterator row_col_iterator
 inline const_row_col_iterator end_row_col() const;
 inline row_col_iterator end_row_col();
+#endif

Modified: mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp	(original)
+++ mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp	Thu Aug 14 12:22:42 2014
@@ -250,6 +250,8 @@
 
 #endif
 
+#if ARMA_VERSION_MAJOR < 4 || \
+    (ARMA_VERSION_MAJOR == 4 && ARMA_VERSION_MINOR < 349)
 template<typename eT>
 inline typename SpMat<eT>::const_row_col_iterator
 SpMat<eT>::begin_row_col() const
@@ -283,3 +285,4 @@
   {
   return end();
   }
+#endif