From fc7478c04d16b8585d6eaff1ae2f473e247aaf2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmx.ch>
Date: Fri, 9 Oct 2015 19:10:08 +0200
Subject: [PATCH] =?UTF-8?q?name=20changes=202=20user:=20Gabriel=20N=C3=BCt?=
 =?UTF-8?q?zi=20<gnuetzi@gmx.ch>=20branch=20'default'=20changed=20unsuppor?=
 =?UTF-8?q?ted/Eigen/CXX11/src/Tensor/Tensor.h=20changed=20unsupported/Eig?=
 =?UTF-8?q?en/CXX11/src/Tensor/TensorMeta.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unsupported/Eigen/CXX11/src/Tensor/Tensor.h     | 12 ++++++------
 unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/unsupported/Eigen/CXX11/src/Tensor/Tensor.h b/unsupported/Eigen/CXX11/src/Tensor/Tensor.h
index 2b892571e..d59fd21dc 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/Tensor.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/Tensor.h
@@ -134,7 +134,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
     >
     EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& coeff(const CustomIndices & indices) const
     {
-        return coeff(internal::CustomIndices2Array<Index,NumIndices>(indices));
+        return coeff(internal::customIndices2Array<Index,NumIndices>(indices));
     }
 
 
@@ -168,7 +168,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
              >
     EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& coeffRef(const CustomIndices & indices)
     {
-        return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(indices));
+        return coeffRef(internal::customIndices2Array<Index,NumIndices>(indices));
     }
 
 
@@ -216,7 +216,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
     EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar& operator()(const CustomIndices & indices) const
     {
         //eigen_assert(checkIndexRange(indices)); /* already in coeff */
-        return coeff(internal::CustomIndices2Array<Index,NumIndices>(indices));
+        return coeff(internal::customIndices2Array<Index,NumIndices>(indices));
     }
 
     // normal indices
@@ -284,7 +284,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
     EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(const CustomIndices & indices)
     {
       //eigen_assert(checkIndexRange(indices)); /* already in coeff */
-      return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(indices));
+      return coeffRef(internal::customIndices2Array<Index,NumIndices>(indices));
     }
 
     EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar& operator()(Index index)
@@ -359,7 +359,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
     template<typename CustomDimension,
              EIGEN_SFINAE_ENABLE_IF( !(isOfNormalIndex<CustomDimension>::value) )
     >
-    inline explicit Tensor(const CustomDimension & dimensions) : Tensor(internal::CustomIndices2Array<Index,NumIndices>(dimensions))
+    inline explicit Tensor(const CustomDimension & dimensions) : Tensor(internal::customIndices2Array<Index,NumIndices>(dimensions))
     {}
 
     template<typename OtherDerived>
@@ -446,7 +446,7 @@ class Tensor : public TensorBase<Tensor<Scalar_, NumIndices_, Options_, IndexTyp
     EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void resize(const CustomDimension & dimensions)
     {
       //eigen_assert(checkIndexRange(indices)); /* already in coeff */
-      return coeffRef(internal::CustomIndices2Array<Index,NumIndices>(dimensions));
+      return coeffRef(internal::customIndices2Array<Index,NumIndices>(dimensions));
     }
 
 
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
index 60a6c1469..01aedd3c9 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
@@ -93,15 +93,15 @@ namespace internal{
 
   template<typename IndexType, Index... Is>
   EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
-  array<Index,sizeof...(Is)> customIndex2Array(const IndexType & idx, numeric_list<Index,Is...>) {
+  array<Index,sizeof...(Is)> customIndices2Array(const IndexType & idx, numeric_list<Index,Is...>) {
     return { idx(Is)... };
   }
 
   /** Make an array (for index/dimensions) out of a custom index */
   template<typename Index, int NumIndices, typename IndexType>
   EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
-  array<Index,NumIndices> customIndex2Array(const IndexType & idx) {
-    return customIndex2Array(idx, typename gen_numeric_list<Index,NumIndices>::type{});
+  array<Index,NumIndices> customIndices2Array(const IndexType & idx) {
+    return customIndices2Array(idx, typename gen_numeric_list<Index,NumIndices>::type{});
   }