1 files changed, 31 insertions, 31 deletions

diff --git a/src/internal/RowAndCol.h b/src/internal/RowAndCol.h
index 03e25651f..0bfc361b0 100644
--- a/src/internal/RowAndCol.h
+++ b/src/internal/RowAndCol.h
@@ -23,37 +23,37 @@
 // License. This exception does not invalidate any other reasons why a work
 // based on this file might be covered by the GNU General Public License.
 
-#ifndef EIGEN_ROWANDCOL_H
-#define EIGEN_ROWANDCOL_H
+#ifndef EI_ROWANDCOL_H
+#define EI_ROWANDCOL_H
 
 template<typename MatrixType> class EiRow
-  : public EiObject<typename MatrixType::Scalar, MatrixRow<MatrixType> >
+  : public EiObject<typename MatrixType::Scalar, EiRow<MatrixType> >
 {
   public:
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::Ref MatRef;
-    friend class EiObject<Scalar, MatrixRow<MatrixType> >;
+    friend class EiObject<Scalar, EiRow<MatrixType> >;
     typedef EiRow Ref;
 
     static const int RowsAtCompileTime = MatrixType::ColsAtCompileTime,
                      ColsAtCompileTime = 1;
 
-    MatrixRow(const MatRef& matrix, int row)
+    EiRow(const MatRef& matrix, int row)
       : m_matrix(matrix), m_row(row)
     {
-      EIGEN_CHECK_ROW_RANGE(matrix, row);
+      EI_CHECK_ROW_RANGE(matrix, row);
     }
     
-    MatrixRow(const MatrixRow& other)
+    EiRow(const EiRow& other)
       : m_matrix(other.m_matrix), m_row(other.m_row) {}
     
     template<typename OtherDerived>
-    MatrixRow& operator=(const EiObject<Scalar, OtherDerived>& other)
+    EiRow& operator=(const EiObject<Scalar, OtherDerived>& other)
     {
-      return EiObject<Scalar, MatrixRow<MatrixType> >::operator=(other);
+      return EiObject<Scalar, EiRow<MatrixType> >::operator=(other);
     }
     
-    EIGEN_INHERIT_ASSIGNMENT_OPERATORS(MatrixRow)
+    EI_INHERIT_ASSIGNMENT_OPERATORS(EiRow)
     
   private:
     const Ref& _ref() const { return *this; }
@@ -63,15 +63,15 @@ template<typename MatrixType> class EiRow
     
     Scalar& _write(int row, int col=0)
     {
-      EIGEN_UNUSED(col);
-      EIGEN_CHECK_ROW_RANGE(*this, row);
+      EI_UNUSED(col);
+      EI_CHECK_ROW_RANGE(*this, row);
       return m_matrix.write(m_row, row);
     }
     
     Scalar _read(int row, int col=0) const
     {
-      EIGEN_UNUSED(col);
-      EIGEN_CHECK_ROW_RANGE(*this, row);
+      EI_UNUSED(col);
+      EI_CHECK_ROW_RANGE(*this, row);
       return m_matrix.read(m_row, row);
     }
     
@@ -80,28 +80,28 @@ template<typename MatrixType> class EiRow
     const int m_row;
 };
 
-template<typename MatrixType> class MatrixCol
-  : public EiObject<typename MatrixType::Scalar, MatrixCol<MatrixType> >
+template<typename MatrixType> class EiColumn
+  : public EiObject<typename MatrixType::Scalar, EiColumn<MatrixType> >
 {
   public:
     typedef typename MatrixType::Scalar Scalar;
     typedef typename MatrixType::Ref MatRef;
-    friend class EiObject<Scalar, MatrixCol<MatrixType> >;
-    typedef MatrixCol Ref;
+    friend class EiObject<Scalar, EiColumn<MatrixType> >;
+    typedef EiColumn Ref;
     
     static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
                      ColsAtCompileTime = 1;
     
-    MatrixCol(const MatRef& matrix, int col)
+    EiColumn(const MatRef& matrix, int col)
       : m_matrix(matrix), m_col(col)
     {
-      EIGEN_CHECK_COL_RANGE(matrix, col);
+      EI_CHECK_COL_RANGE(matrix, col);
     }
     
-    MatrixCol(const MatrixCol& other)
+    EiColumn(const EiColumn& other)
       : m_matrix(other.m_matrix), m_col(other.m_col) {}
     
-    EIGEN_INHERIT_ASSIGNMENT_OPERATORS(MatrixCol)
+    EI_INHERIT_ASSIGNMENT_OPERATORS(EiColumn)
     
   private:
     const Ref& _ref() const { return *this; }
@@ -110,15 +110,15 @@ template<typename MatrixType> class MatrixCol
     
     Scalar& _write(int row, int col=0)
     {
-      EIGEN_UNUSED(col);
-      EIGEN_CHECK_ROW_RANGE(*this, row);
+      EI_UNUSED(col);
+      EI_CHECK_ROW_RANGE(*this, row);
       return m_matrix.write(row, m_col);
     }
     
     Scalar _read(int row, int col=0) const
     {
-      EIGEN_UNUSED(col);
-      EIGEN_CHECK_ROW_RANGE(*this, row);
+      EI_UNUSED(col);
+      EI_CHECK_ROW_RANGE(*this, row);
       return m_matrix.read(row, m_col);
     }
     
@@ -128,17 +128,17 @@ template<typename MatrixType> class MatrixCol
 };
 
 template<typename Scalar, typename Derived>
-MatrixRow<EiObject<Scalar, Derived> >
+EiRow<EiObject<Scalar, Derived> >
 EiObject<Scalar, Derived>::row(int i)
 {
-  return MatrixRow<EiObject>(ref(), i);
+  return EiRow<EiObject>(ref(), i);
 }
 
 template<typename Scalar, typename Derived>
-MatrixCol<EiObject<Scalar, Derived> >
+EiColumn<EiObject<Scalar, Derived> >
 EiObject<Scalar, Derived>::col(int i)
 {
-  return MatrixCol<EiObject>(ref(), i);
+  return EiColumn<EiObject>(ref(), i);
 }
 
-#endif // EIGEN_ROWANDCOL_H
+#endif // EI_ROWANDCOL_H