[mlpack] 314/324: Don't add row_col_iterator support after 4.349 (currently svn trunk) since Conrad accepted our patches.

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit 7427219a3f96091c70da14c85f3e198f40abb268
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Thu Aug 14 16:22:42 2014 +0000

    Don't add row_col_iterator support after 4.349 (currently svn trunk) since
    Conrad accepted our patches.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17027 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 src/mlpack/core/arma_extend/Mat_extra_bones.hpp   | 3 +++
 src/mlpack/core/arma_extend/Mat_extra_meat.hpp    | 4 ++++
 src/mlpack/core/arma_extend/SpMat_extra_bones.hpp | 5 ++++-
 src/mlpack/core/arma_extend/SpMat_extra_meat.hpp  | 3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/mlpack/core/arma_extend/Mat_extra_bones.hpp b/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
index 7823663..45b25d5 100644
--- a/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
+++ b/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
@@ -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 @@ inline row_col_iterator begin_row_col();
 // end for iterator row_col_iterator
 inline const_row_col_iterator end_row_col() const;
 inline row_col_iterator end_row_col();
+#endif
diff --git a/src/mlpack/core/arma_extend/Mat_extra_meat.hpp b/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
index 06b8084..fe7ba1b 100644
--- a/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
+++ b/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
@@ -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 @@ Mat<eT>::end_row_col()
   {
   return ++row_col_iterator(*this, n_rows - 1, n_cols - 1);
   }
+
+#endif
diff --git a/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp b/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
index d9a9709..1c84221 100644
--- a/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
+++ b/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
@@ -19,9 +19,11 @@ template<typename T1, typename T2> inline SpMat(
 #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 @@ inline row_col_iterator begin_row_col();
 // end for iterator row_col_iterator
 inline const_row_col_iterator end_row_col() const;
 inline row_col_iterator end_row_col();
+#endif
diff --git a/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp b/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp
index e8b0413..2cf980b 100644
--- a/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp
+++ b/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp
@@ -250,6 +250,8 @@ SpMat<eT>::SpMat(const Base<uword,T1>& locations_expr, const Base<eT,T2>& vals_e
 
 #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 @@ SpMat<eT>::end_row_col()
   {
   return end();
   }
+#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git