aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorGravatar David Tellenbach <david.tellenbach@tellnotes.org>2019-01-23 00:07:19 +0100
committerGravatar David Tellenbach <david.tellenbach@tellnotes.org>2019-01-23 00:07:19 +0100
commit237b03b3724df7137e82512cd7ad758e20b8e6b6 (patch)
tree05299915caad11764673aed317c8c9c8eae8fa9b /doc
parentbd6dadcda8974622bdc4c731068e4b3cf84bcf9c (diff)
PR 574: use variadic template instead of initializer_list to implement fixed-size vector ctor from coefficients.
Diffstat (limited to 'doc')
-rw-r--r--doc/TutorialMatrixClass.dox6
-rw-r--r--doc/snippets/Array_initializer_list2_cxx11.cpp3
-rw-r--r--doc/snippets/Array_variadic_ctor_cxx11.cpp3
-rw-r--r--doc/snippets/Matrix_initializer_list2_cxx11.cpp3
-rw-r--r--doc/snippets/Matrix_variadic_ctor_cxx11.cpp3
5 files changed, 9 insertions, 9 deletions
diff --git a/doc/TutorialMatrixClass.dox b/doc/TutorialMatrixClass.dox
index c44c8f24f..2c452220f 100644
--- a/doc/TutorialMatrixClass.dox
+++ b/doc/TutorialMatrixClass.dox
@@ -109,11 +109,11 @@ Vector3d b(5.0, 6.0, 7.0);
Vector4d c(5.0, 6.0, 7.0, 8.0);
\endcode
-If C++11 is enabled, fixed-size column or row vectors of arbitrary size can be initialized through a single initializer list (\link Matrix::Matrix(const std::initializer_list<Scalar>&) details \endlink):
+If C++11 is enabled, fixed-size column or row vectors of arbitrary size can be initialized by passing an arbitrary number of coefficients:
\code
-Vector2i a {1, 2}; // A column vector containing the elements {1, 2}
+Vector2i a(1, 2); // A column vector containing the elements {1, 2}
Matrix<int, 5, 1> b {1, 2, 3, 4, 5}; // A row-vector containing the elements {1, 2, 3, 4, 5}
-Matrix<int, 1, 5> c {1, 2, 3, 4, 5}; // A column vector containing the elements {1, 2, 3, 4, 5}
+Matrix<int, 1, 5> c = {1, 2, 3, 4, 5}; // A column vector containing the elements {1, 2, 3, 4, 5}
\endcode
In the general case of matrices and vectors with either fixed or runtime sizes,
diff --git a/doc/snippets/Array_initializer_list2_cxx11.cpp b/doc/snippets/Array_initializer_list2_cxx11.cpp
deleted file mode 100644
index 20e74546a..000000000
--- a/doc/snippets/Array_initializer_list2_cxx11.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Array<int, 1, 6> a {1, 2, 3, 4, 5, 6};
-Array<int, 3, 1> b {1, 2, 3};
-cout << a << "\n\n" << b << endl; \ No newline at end of file
diff --git a/doc/snippets/Array_variadic_ctor_cxx11.cpp b/doc/snippets/Array_variadic_ctor_cxx11.cpp
new file mode 100644
index 000000000..234c7a720
--- /dev/null
+++ b/doc/snippets/Array_variadic_ctor_cxx11.cpp
@@ -0,0 +1,3 @@
+Array<int, 1, 6> a(1, 2, 3, 4, 5, 6);
+Array<int, 3, 1> b {1, 2, 3};
+cout << a << "\n\n" << b << endl; \ No newline at end of file
diff --git a/doc/snippets/Matrix_initializer_list2_cxx11.cpp b/doc/snippets/Matrix_initializer_list2_cxx11.cpp
deleted file mode 100644
index 2fde52b8d..000000000
--- a/doc/snippets/Matrix_initializer_list2_cxx11.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Matrix<int, 1, 6> a {1, 2, 3, 4, 5, 6};
-Matrix<int, 3, 1> b {1, 2, 3};
-cout << a << "\n\n" << b << endl; \ No newline at end of file
diff --git a/doc/snippets/Matrix_variadic_ctor_cxx11.cpp b/doc/snippets/Matrix_variadic_ctor_cxx11.cpp
new file mode 100644
index 000000000..fcb4ccf88
--- /dev/null
+++ b/doc/snippets/Matrix_variadic_ctor_cxx11.cpp
@@ -0,0 +1,3 @@
+Matrix<int, 1, 6> a(1, 2, 3, 4, 5, 6);
+Matrix<int, 3, 1> b {1, 2, 3};
+cout << a << "\n\n" << b << endl; \ No newline at end of file