diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-27 17:01:22 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-27 17:01:22 +0100 |
commit | 1c9e0d95263480a5ae5d645cabb41f835d1dbb70 (patch) | |
tree | 25f46dc18d8f8430d46ad365452ce0d8a7c9d9d0 /sources/shiboken2/tests/libsample | |
parent | ad14f64972d182fca3e180c08750ca020a91b84e (diff) | |
parent | 2490c34325bb1b39922582090a4cb69c01726999 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I79637555fbfbd596dee4313baf80149d03bb5206
Diffstat (limited to 'sources/shiboken2/tests/libsample')
-rw-r--r-- | sources/shiboken2/tests/libsample/sample.cpp | 12 | ||||
-rw-r--r-- | sources/shiboken2/tests/libsample/sample.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sources/shiboken2/tests/libsample/sample.cpp b/sources/shiboken2/tests/libsample/sample.cpp index fa1e1fda3..850674bd9 100644 --- a/sources/shiboken2/tests/libsample/sample.cpp +++ b/sources/shiboken2/tests/libsample/sample.cpp @@ -28,12 +28,20 @@ #include "sample.h" -sample::sample::sample(int value) : m_value(value) +namespace sample +{ + +sample::sample(int value) : m_value(value) { } -int sample::sample::value() const +int sample::value() const { return m_value; } +bool operator==(const sample&s1, const sample&s2) +{ + return s1.value() == s2.value(); +} +} // namespace sample diff --git a/sources/shiboken2/tests/libsample/sample.h b/sources/shiboken2/tests/libsample/sample.h index 46e3d0d1a..68b54e067 100644 --- a/sources/shiboken2/tests/libsample/sample.h +++ b/sources/shiboken2/tests/libsample/sample.h @@ -43,6 +43,9 @@ namespace sample private: int m_value; }; + + // shiboken must not generate richcompare for namespace sample + LIBSAMPLE_API bool operator==(const sample&s1, const sample&s2); } #endif |