diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-10 15:14:13 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-11 15:28:28 +0100 |
commit | 4c2c58511df05febd7f51fe41c8e377435f9271e (patch) | |
tree | 046fc150014aad7f34372e18544d9a05bbcfbfea /sources/shiboken6/tests/libminimal | |
parent | 2f0061786046f0855373eb4e099a8bfe0e7b7c2a (diff) |
shiboken6/libminimal: Add std::array (C++ 11)
[ChangeLog][shiboken6] Support for std::array has been added.
Task-number: PYSIDE-1605
Task-number: PYSIDE-2174
Change-Id: I5192dfe1fa88d794856169638bb97abfc916bcf5
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/tests/libminimal')
-rw-r--r-- | sources/shiboken6/tests/libminimal/containeruser.cpp | 22 | ||||
-rw-r--r-- | sources/shiboken6/tests/libminimal/containeruser.h | 8 |
2 files changed, 29 insertions, 1 deletions
diff --git a/sources/shiboken6/tests/libminimal/containeruser.cpp b/sources/shiboken6/tests/libminimal/containeruser.cpp index 78fc7a045..29af52aef 100644 --- a/sources/shiboken6/tests/libminimal/containeruser.cpp +++ b/sources/shiboken6/tests/libminimal/containeruser.cpp @@ -6,7 +6,7 @@ #include <algorithm> #include <numeric> -ContainerUser::ContainerUser() : m_intVector{1, 2, 3} +ContainerUser::ContainerUser() : m_intVector{1, 2, 3}, m_intArray{1, 2, 3} { } @@ -33,3 +33,23 @@ void ContainerUser::setIntVector(const std::vector<int> &v) { m_intVector = v; } + +std::array<int, 3> ContainerUser::createIntArray() +{ + return {1, 2, 3}; +} + +int ContainerUser::sumIntArray(const std::array<int, 3> &intArray) +{ + return std::accumulate(intArray.cbegin(), intArray.cend(), 0); +} + +std::array<int, 3> &ContainerUser::intArray() +{ + return m_intArray; +} + +void ContainerUser::setIntArray(const std::array<int, 3> &a) +{ + m_intArray = a; +} diff --git a/sources/shiboken6/tests/libminimal/containeruser.h b/sources/shiboken6/tests/libminimal/containeruser.h index 4cb4df0b9..55e4020ec 100644 --- a/sources/shiboken6/tests/libminimal/containeruser.h +++ b/sources/shiboken6/tests/libminimal/containeruser.h @@ -6,6 +6,7 @@ #include "libminimalmacros.h" +#include <array> #include <vector> /// Exercise simple, sequential containers. More advanced tests are in ListUser @@ -21,8 +22,15 @@ public: std::vector<int> &intVector(); void setIntVector(const std::vector<int> &); + static std::array<int, 3> createIntArray(); + static int sumIntArray(const std::array<int, 3> &intArray); + + std::array<int, 3> &intArray(); + void setIntArray(const std::array<int, 3> &); + private: std::vector<int> m_intVector; + std::array<int, 3> m_intArray; }; #endif // CONTAINERUSER_H |