reorganization/cleanup

3 files changed, 69 insertions, 42 deletions

diff --git a/Eigen/src/Core/ForwardDeclarations.h b/Eigen/src/Core/ForwardDeclarations.h
new file mode 100644
index 000000000..ea5d0dd36
--- /dev/null
+++ b/Eigen/src/Core/ForwardDeclarations.h
@@ -0,0 +1,64 @@
+// This file is part of Eigen, a lightweight C++ template library
+// for linear algebra. Eigen itself is part of the KDE project.
+//
+// Copyright (C) 2006-2008 Benoit Jacob <jacob@math.jussieu.fr>
+//
+// Eigen is free software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 or (at your option) any later version.
+//
+// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Eigen; if not, write to the Free Software Foundation, Inc., 51
+// Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// 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_FORWARDDECLARATIONS_H
+#define EIGEN_FORWARDDECLARATIONS_H
+
+template<typename _Scalar, int _Rows, int _Cols, int _StorageOrder> class Matrix;
+template<typename MatrixType> class MatrixRef;
+template<typename NewScalar, typename MatrixType> class Cast;
+template<typename MatrixType> class Row;
+template<typename MatrixType> class Column;
+template<typename MatrixType> class Minor;
+template<typename MatrixType> class DynBlock;
+template<typename MatrixType, int BlockRows, int BlockCols> class Block;
+template<typename MatrixType> class Transpose;
+template<typename MatrixType> class Conjugate;
+template<typename MatrixType> class Opposite;
+template<typename Lhs, typename Rhs> class Sum;
+template<typename Lhs, typename Rhs> class Difference;
+template<typename Lhs, typename Rhs> class Product;
+template<typename FactorType, typename MatrixType> class ScalarMultiple;
+template<typename MatrixType> class Random;
+template<typename MatrixType> class Zero;
+template<typename MatrixType> class Ones;
+template<typename CoeffsVectorType> class DiagonalMatrix;
+template<typename MatrixType> class DiagonalCoeffs;
+template<typename MatrixType> class Identity;
+template<typename ExpressionType> class Eval;
+template<typename MatrixType> class Map;
+
+template<typename T> struct Reference
+{
+  typedef T Type;
+};
+
+template<typename _Scalar, int _Rows, int _Cols, int _StorageOrder>
+struct Reference<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
+{
+  typedef MatrixRef<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> > Type;
+};
+
+#endif // EIGEN_FORWARDDECLARATIONS_H
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h
index c817cf4de..8d9bd6491 100644
--- a/Eigen/src/Core/MatrixBase.h
+++ b/Eigen/src/Core/MatrixBase.h
@@ -96,7 +96,7 @@ template<typename Scalar, typename Derived> class MatrixBase
       * other hand, this MatrixBase type is an actual matrix or vector type, then \a Ref is
       * a typedef to MatrixRef, which works as a reference, so that matrices and vectors
       * are passed by reference, not by value. \sa ref()*/
-    typedef typename ForwardDecl<Derived>::Ref Ref;
+    typedef typename Reference<Derived>::Type Ref;
     
     /** This is the "real scalar" type; if the \a Scalar type is already real numbers
       * (e.g. int, float or double) then \a RealScalar is just the same as \a Scalar. If
diff --git a/Eigen/src/Core/Util.h b/Eigen/src/Core/Util.h
index 72b355530..91e51a476 100644
--- a/Eigen/src/Core/Util.h
+++ b/Eigen/src/Core/Util.h
@@ -58,9 +58,9 @@ using Eigen::MatrixBase;
 #endif
 
 #ifdef __GNUC__
-# define EIGEN_ALWAYS_INLINE __attribute__((always_inline))
+#define EIGEN_ALWAYS_INLINE __attribute__((always_inline))
 #else
-# define EIGEN_ALWAYS_INLINE
+#define EIGEN_ALWAYS_INLINE
 #endif
 
 #define EIGEN_INHERIT_ASSIGNMENT_OPERATOR(Derived, Op) \
@@ -88,48 +88,11 @@ EIGEN_INHERIT_ASSIGNMENT_OPERATOR(Derived, -=) \
 EIGEN_INHERIT_SCALAR_ASSIGNMENT_OPERATOR(Derived, *=) \
 EIGEN_INHERIT_SCALAR_ASSIGNMENT_OPERATOR(Derived, /=)
 
-const int Dynamic = -1;
-const int Generic = -2;
+const int Dynamic = -10;
+const int Generic = -20;
 const int ColumnMajor = 0;
 const int RowMajor = 1;
 
-//forward declarations
-template<typename _Scalar, int _Rows, int _Cols, int _StorageOrder>
-  class Matrix;
-template<typename MatrixType> class MatrixRef;
-template<typename NewScalar, typename MatrixType> class Cast;
-template<typename MatrixType> class Row;
-template<typename MatrixType> class Column;
-template<typename MatrixType> class Minor;
-template<typename MatrixType> class DynBlock;
-template<typename MatrixType, int BlockRows, int BlockCols> class Block;
-template<typename MatrixType> class Transpose;
-template<typename MatrixType> class Conjugate;
-template<typename MatrixType> class Opposite;
-template<typename Lhs, typename Rhs> class Sum;
-template<typename Lhs, typename Rhs> class Difference;
-template<typename Lhs, typename Rhs> class Product;
-template<typename FactorType, typename MatrixType> class ScalarMultiple;
-template<typename MatrixType> class Random;
-template<typename MatrixType> class Zero;
-template<typename MatrixType> class Ones;
-template<typename CoeffsVectorType> class DiagonalMatrix;
-template<typename MatrixType> class DiagonalCoeffs;
-template<typename MatrixType> class Identity;
-template<typename ExpressionType> class Eval;
-template<typename MatrixType> class Map;
-
-template<typename T> struct ForwardDecl
-{
-  typedef T Ref;
-};
-
-template<typename _Scalar, int _Rows, int _Cols, int _StorageOrder>
-struct ForwardDecl<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> >
-{
-  typedef MatrixRef<Matrix<_Scalar, _Rows, _Cols, _StorageOrder> > Ref;
-};
-
 //classes inheriting NoOperatorEquals don't generate a default operator=.
 class NoOperatorEquals
 {