From e8cdbedefb1913b5a0e2f2b7d38470f081cb8d29 Mon Sep 17 00:00:00 2001
From: Christoph Hertzberg <chtz@informatik.uni-bremen.de>
Date: Thu, 4 Dec 2014 22:48:53 +0100
Subject: bug #877, bug #572: Introduce a global Index typedef. Rename
 Sparse*::Index to StorageIndex, make Dense*::StorageIndex an alias to
 DenseIndex. Overall this commit gets rid of all Index conversion warnings.

---
 Eigen/src/Core/EigenBase.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Eigen/src/Core/EigenBase.h')

diff --git a/Eigen/src/Core/EigenBase.h b/Eigen/src/Core/EigenBase.h
index 52b66e6dc..c98ca467a 100644
--- a/Eigen/src/Core/EigenBase.h
+++ b/Eigen/src/Core/EigenBase.h
@@ -28,7 +28,7 @@ template<typename Derived> struct EigenBase
 //   typedef typename internal::plain_matrix_type<Derived>::type PlainObject;
 
   typedef typename internal::traits<Derived>::StorageKind StorageKind;
-  typedef typename internal::traits<Derived>::Index Index;
+  typedef typename internal::traits<Derived>::StorageIndex StorageIndex;
 
   /** \returns a reference to the derived object */
   EIGEN_DEVICE_FUNC
@@ -46,14 +46,14 @@ template<typename Derived> struct EigenBase
 
   /** \returns the number of rows. \sa cols(), RowsAtCompileTime */
   EIGEN_DEVICE_FUNC
-  inline Index rows() const { return derived().rows(); }
+  inline StorageIndex rows() const { return derived().rows(); }
   /** \returns the number of columns. \sa rows(), ColsAtCompileTime*/
   EIGEN_DEVICE_FUNC
-  inline Index cols() const { return derived().cols(); }
+  inline StorageIndex cols() const { return derived().cols(); }
   /** \returns the number of coefficients, which is rows()*cols().
     * \sa rows(), cols(), SizeAtCompileTime. */
   EIGEN_DEVICE_FUNC
-  inline Index size() const { return rows() * cols(); }
+  inline StorageIndex size() const { return rows() * cols(); }
 
   /** \internal Don't use it, but do the equivalent: \code dst = *this; \endcode */
   template<typename Dest>
-- 
cgit v1.2.3