From 1bc207c528bcfc4d9fb27ada28a8aaf1b9e8d3f5 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Sat, 30 Jan 2016 14:43:21 +0100
Subject: backout changeset d4a9e615699bd7f26864d57d2b28021b9f64b6ff : the
 extended SparseView is not needed anymore

---
 Eigen/src/SparseCore/SparseUtil.h |  1 +
 Eigen/src/SparseCore/SparseView.h | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'Eigen/src/SparseCore')

diff --git a/Eigen/src/SparseCore/SparseUtil.h b/Eigen/src/SparseCore/SparseUtil.h
index 3b1cf03ab..74df0d496 100644
--- a/Eigen/src/SparseCore/SparseUtil.h
+++ b/Eigen/src/SparseCore/SparseUtil.h
@@ -56,6 +56,7 @@ template<typename _Scalar, int _Flags = 0, typename _StorageIndex = int>  class
 
 template<typename MatrixType, unsigned int UpLo>  class SparseSelfAdjointView;
 template<typename Lhs, typename Rhs>              class SparseDiagonalProduct;
+template<typename MatrixType> class SparseView;
 
 template<typename Lhs, typename Rhs>        class SparseSparseProduct;
 template<typename Lhs, typename Rhs>        class SparseTimeDenseProduct;
diff --git a/Eigen/src/SparseCore/SparseView.h b/Eigen/src/SparseCore/SparseView.h
index f2af1b5d9..b867877d8 100644
--- a/Eigen/src/SparseCore/SparseView.h
+++ b/Eigen/src/SparseCore/SparseView.h
@@ -1,7 +1,7 @@
 // This file is part of Eigen, a lightweight C++ template library
 // for linear algebra.
 //
-// Copyright (C) 2011-2015 Gael Guennebaud <gael.guennebaud@inria.fr>
+// Copyright (C) 2011-2014 Gael Guennebaud <gael.guennebaud@inria.fr>
 // Copyright (C) 2010 Daniel Lowengrub <lowdanie@gmail.com>
 //
 // This Source Code Form is subject to the terms of the Mozilla
@@ -15,8 +15,8 @@ namespace Eigen {
 
 namespace internal {
 
-template<typename MatrixType, bool KeepZeros>
-struct traits<SparseView<MatrixType,KeepZeros> > : traits<MatrixType>
+template<typename MatrixType>
+struct traits<SparseView<MatrixType> > : traits<MatrixType>
 {
   typedef typename MatrixType::StorageIndex StorageIndex;
   typedef Sparse StorageKind;
@@ -27,8 +27,8 @@ struct traits<SparseView<MatrixType,KeepZeros> > : traits<MatrixType>
 
 } // end namespace internal
 
-template<typename MatrixType, bool KeepZeros>
-class SparseView : public SparseMatrixBase<SparseView<MatrixType,KeepZeros> >
+template<typename MatrixType>
+class SparseView : public SparseMatrixBase<SparseView<MatrixType> >
 {
   typedef typename MatrixType::Nested MatrixTypeNested;
   typedef typename internal::remove_all<MatrixTypeNested>::type _MatrixTypeNested;
@@ -66,13 +66,13 @@ namespace internal {
 // This is tricky because implementing an inner iterator on top of an IndexBased evaluator is
 // not easy because the evaluators do not expose the sizes of the underlying expression.
   
-template<typename ArgType,bool KeepZeros>
-struct unary_evaluator<SparseView<ArgType,KeepZeros>, IteratorBased>
-  : public evaluator_base<SparseView<ArgType,KeepZeros> >
+template<typename ArgType>
+struct unary_evaluator<SparseView<ArgType>, IteratorBased>
+  : public evaluator_base<SparseView<ArgType> >
 {
     typedef typename evaluator<ArgType>::InnerIterator EvalIterator;
   public:
-    typedef SparseView<ArgType,KeepZeros> XprType;
+    typedef SparseView<ArgType> XprType;
     
     class InnerIterator : public EvalIterator
     {
@@ -88,7 +88,7 @@ struct unary_evaluator<SparseView<ArgType,KeepZeros>, IteratorBased>
         EIGEN_STRONG_INLINE InnerIterator& operator++()
         {
           EvalIterator::operator++();
-          if(!KeepZeros) incrementToNonZero();
+          incrementToNonZero();
           return *this;
         }
 
@@ -119,12 +119,12 @@ struct unary_evaluator<SparseView<ArgType,KeepZeros>, IteratorBased>
     const XprType &m_view;
 };
 
-template<typename ArgType,bool KeepZeros>
-struct unary_evaluator<SparseView<ArgType,KeepZeros>, IndexBased>
-  : public evaluator_base<SparseView<ArgType,KeepZeros> >
+template<typename ArgType>
+struct unary_evaluator<SparseView<ArgType>, IndexBased>
+  : public evaluator_base<SparseView<ArgType> >
 {
   public:
-    typedef SparseView<ArgType,KeepZeros> XprType;
+    typedef SparseView<ArgType> XprType;
   protected:
     enum { IsRowMajor = (XprType::Flags&RowMajorBit)==RowMajorBit };
     typedef typename XprType::Scalar Scalar;
@@ -144,7 +144,7 @@ struct unary_evaluator<SparseView<ArgType,KeepZeros>, IndexBased>
         EIGEN_STRONG_INLINE InnerIterator& operator++()
         {
           m_inner++;
-          if(!KeepZeros) incrementToNonZero();
+          incrementToNonZero();
           return *this;
         }
 
-- 
cgit v1.2.3