final fixes and updates for alpha3

3 files changed, 35 insertions, 35 deletions

diff --git a/doc/examples/class_Block.cpp b/doc/examples/class_Block.cpp
index b34cf13ad..6d48d235d 100644
--- a/doc/examples/class_Block.cpp
+++ b/doc/examples/class_Block.cpp
@@ -3,24 +3,24 @@ USING_PART_OF_NAMESPACE_EIGEN
 using namespace std;
 
 template<typename Scalar, typename Derived>
-Eigen::FixedBlock<Derived, 2, 2>
-topLeft2x2Corner(MatrixBase<Scalar, Derived>& m)
+Eigen::Block<Derived>
+topLeftCorner(MatrixBase<Scalar, Derived>& m, int rows, int cols)
 {
-  return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
+  return Eigen::Block<Derived>(m.ref(), 0, 0, rows, cols);
 }
 
 template<typename Scalar, typename Derived>
-const Eigen::FixedBlock<Derived, 2, 2>
-topLeft2x2Corner(const MatrixBase<Scalar, Derived>& m)
+const Eigen::Block<Derived>
+topLeftCorner(const MatrixBase<Scalar, Derived>& m, int rows, int cols)
 {
-  return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
+  return Eigen::Block<Derived>(m.ref(), 0, 0, rows, cols);
 }
 
 int main(int, char**)
 {
-  Matrix3d m = Matrix3d::identity();
-  cout << topLeft2x2Corner(4*m) << endl; // calls the const version
-  topLeft2x2Corner(m) *= 2;              // calls the non-const version
+  Matrix4d m = Matrix4d::identity();
+  cout << topLeftCorner(4*m, 2, 3) << endl; // calls the const version
+  topLeftCorner(m, 2, 3) *= 5;              // calls the non-const version
   cout << "Now the matrix m is:" << endl << m << endl;
   return 0;
 }
diff --git a/doc/examples/class_DynBlock.cpp b/doc/examples/class_DynBlock.cpp
deleted file mode 100644
index 6d48d235d..000000000
--- a/doc/examples/class_DynBlock.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <Eigen/Core>
-USING_PART_OF_NAMESPACE_EIGEN
-using namespace std;
-
-template<typename Scalar, typename Derived>
-Eigen::Block<Derived>
-topLeftCorner(MatrixBase<Scalar, Derived>& m, int rows, int cols)
-{
-  return Eigen::Block<Derived>(m.ref(), 0, 0, rows, cols);
-}
-
-template<typename Scalar, typename Derived>
-const Eigen::Block<Derived>
-topLeftCorner(const MatrixBase<Scalar, Derived>& m, int rows, int cols)
-{
-  return Eigen::Block<Derived>(m.ref(), 0, 0, rows, cols);
-}
-
-int main(int, char**)
-{
-  Matrix4d m = Matrix4d::identity();
-  cout << topLeftCorner(4*m, 2, 3) << endl; // calls the const version
-  topLeftCorner(m, 2, 3) *= 5;              // calls the non-const version
-  cout << "Now the matrix m is:" << endl << m << endl;
-  return 0;
-}
diff --git a/doc/examples/class_FixedBlock.cpp b/doc/examples/class_FixedBlock.cpp
new file mode 100644
index 000000000..b34cf13ad
--- /dev/null
+++ b/doc/examples/class_FixedBlock.cpp
@@ -0,0 +1,26 @@
+#include <Eigen/Core>
+USING_PART_OF_NAMESPACE_EIGEN
+using namespace std;
+
+template<typename Scalar, typename Derived>
+Eigen::FixedBlock<Derived, 2, 2>
+topLeft2x2Corner(MatrixBase<Scalar, Derived>& m)
+{
+  return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
+}
+
+template<typename Scalar, typename Derived>
+const Eigen::FixedBlock<Derived, 2, 2>
+topLeft2x2Corner(const MatrixBase<Scalar, Derived>& m)
+{
+  return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
+}
+
+int main(int, char**)
+{
+  Matrix3d m = Matrix3d::identity();
+  cout << topLeft2x2Corner(4*m) << endl; // calls the const version
+  topLeft2x2Corner(m) *= 2;              // calls the non-const version
+  cout << "Now the matrix m is:" << endl << m << endl;
+  return 0;
+}