From 237b03b3724df7137e82512cd7ad758e20b8e6b6 Mon Sep 17 00:00:00 2001 From: David Tellenbach Date: Wed, 23 Jan 2019 00:07:19 +0100 Subject: PR 574: use variadic template instead of initializer_list to implement fixed-size vector ctor from coefficients. --- doc/TutorialMatrixClass.dox | 6 +++--- doc/snippets/Array_initializer_list2_cxx11.cpp | 3 --- doc/snippets/Array_variadic_ctor_cxx11.cpp | 3 +++ doc/snippets/Matrix_initializer_list2_cxx11.cpp | 3 --- doc/snippets/Matrix_variadic_ctor_cxx11.cpp | 3 +++ 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 doc/snippets/Array_initializer_list2_cxx11.cpp create mode 100644 doc/snippets/Array_variadic_ctor_cxx11.cpp delete mode 100644 doc/snippets/Matrix_initializer_list2_cxx11.cpp create mode 100644 doc/snippets/Matrix_variadic_ctor_cxx11.cpp (limited to 'doc') 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&) 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 b {1, 2, 3, 4, 5}; // A row-vector containing the elements {1, 2, 3, 4, 5} -Matrix c {1, 2, 3, 4, 5}; // A column vector containing the elements {1, 2, 3, 4, 5} +Matrix 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 a {1, 2, 3, 4, 5, 6}; -Array 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 a(1, 2, 3, 4, 5, 6); +Array 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 a {1, 2, 3, 4, 5, 6}; -Matrix 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 a(1, 2, 3, 4, 5, 6); +Matrix b {1, 2, 3}; +cout << a << "\n\n" << b << endl; \ No newline at end of file -- cgit v1.2.3