Patch by Gael Guennebaud: unify fixed-size and dynamic-size Block

expressions, update documentation.

4 files changed, 11 insertions, 11 deletions

diff --git a/doc/examples/class_FixedBlock.cpp b/doc/examples/class_FixedBlock.cpp
index b34cf13ad..a6025231e 100644
--- a/doc/examples/class_FixedBlock.cpp
+++ b/doc/examples/class_FixedBlock.cpp
@@ -3,17 +3,17 @@ USING_PART_OF_NAMESPACE_EIGEN
 using namespace std;
 
 template<typename Scalar, typename Derived>
-Eigen::FixedBlock<Derived, 2, 2>
+Eigen::Block<Derived, 2, 2>
 topLeft2x2Corner(MatrixBase<Scalar, Derived>& m)
 {
-  return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
+  return Eigen::Block<Derived, 2, 2>(m.ref(), 0, 0);
 }
 
 template<typename Scalar, typename Derived>
-const Eigen::FixedBlock<Derived, 2, 2>
+const Eigen::Block<Derived, 2, 2>
 topLeft2x2Corner(const MatrixBase<Scalar, Derived>& m)
 {
-  return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
+  return Eigen::Block<Derived, 2, 2>(m.ref(), 0, 0);
 }
 
 int main(int, char**)
diff --git a/doc/snippets/MatrixBase_fixedBlock_int_int.cpp b/doc/snippets/MatrixBase_fixedBlock_int_int.cpp
index 984fd7094..320112748 100644
--- a/doc/snippets/MatrixBase_fixedBlock_int_int.cpp
+++ b/doc/snippets/MatrixBase_fixedBlock_int_int.cpp
@@ -1,5 +1,5 @@
 Matrix4d m = Vector4d(1,2,3,4).asDiagonal();
 cout << "Here is the matrix m:" << endl << m << endl;
-cout << "Here is m.fixedBlock<2, 2>(2, 2):" << endl << m.fixedBlock<2, 2>(2, 2) << endl;
-m.fixedBlock<2, 2>(2, 0) = m.fixedBlock<2, 2>(2, 2);
+cout << "Here is m.fixed<2, 2>(2, 2):" << endl << m.block<2, 2>(2, 2) << endl;
+m.block<2, 2>(2, 0) = m.block<2, 2>(2, 2);
 cout << "Now the matrix m is:" << endl << m << endl;
diff --git a/doc/snippets/MatrixBase_setIdentity.cpp b/doc/snippets/MatrixBase_setIdentity.cpp
index b14fcdd27..17a706ca2 100644
--- a/doc/snippets/MatrixBase_setIdentity.cpp
+++ b/doc/snippets/MatrixBase_setIdentity.cpp
@@ -1,3 +1,3 @@
 Matrix4i m = Matrix4i::zero();
-m.fixedBlock<3,3>(1,0).setIdentity();
+m.block<3,3>(1,0).setIdentity();
 cout << m << endl;
diff --git a/doc/tutorial.cpp b/doc/tutorial.cpp
index 10406819f..b0627083d 100644
--- a/doc/tutorial.cpp
+++ b/doc/tutorial.cpp
@@ -18,13 +18,13 @@ int main(int, char **)
   // notice how we are mixing fixed-size and dynamic-size types.
   
   cout << "In the top-left block, we put the matrix m shown above." << endl;
-  m2.fixedBlock<2,2>(0,0) = m;
+  m2.block<2,2>(0,0) = m;
   cout << "In the bottom-left block, we put the matrix m*m, which is:" << endl << m*m << endl;
-  m2.fixedBlock<2,2>(2,0) = m * m;
+  m2.block<2,2>(2,0) = m * m;
   cout << "In the top-right block, we put the matrix m+m, which is:" << endl << m+m << endl;
-  m2.fixedBlock<2,2>(0,2) = m + m;
+  m2.block<2,2>(0,2) = m + m;
   cout << "In the bottom-right block, we put the matrix m-m, which is:" << endl << m-m << endl;
-  m2.fixedBlock<2,2>(2,2) = m - m;
+  m2.block<2,2>(2,2) = m - m;
   cout << "Now the 4x4 matrix m2 is:" << endl << m2 << endl;
   
   cout << "Row 0 of m2 is:" << endl << m2.row(0) << endl;