diff options
Diffstat (limited to 'src/gui/math3d/qvector4d.cpp')
| -rw-r--r-- | src/gui/math3d/qvector4d.cpp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index c42986d777..cf0c033e86 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -52,39 +52,6 @@ QT_BEGIN_NAMESPACE static_assert(std::is_standard_layout<QVector4D>::value, "QVector4D is supposed to be standard layout"); static_assert(sizeof(QVector4D) == sizeof(float) * 4, "QVector4D is not supposed to have padding at the end"); -// QVector4D used to be defined as class QVector4D { float x, y, z, w; };, -// now instead it is defined as classs QVector4D { float v[4]; };. -// Check that binary compatibility is preserved. -// ### Qt 6: remove all of these checks. - -namespace { - -struct QVector4DOld -{ - float x, y, z, w; -}; - -struct QVector4DNew -{ - float v[4]; -}; - -static_assert(std::is_standard_layout<QVector4DOld>::value, "Binary compatibility break in QVector4D"); -static_assert(std::is_standard_layout<QVector4DNew>::value, "Binary compatibility break in QVector4D"); - -static_assert(sizeof(QVector4DOld) == sizeof(QVector4DNew), "Binary compatibility break in QVector4D"); - -// requires a constexpr offsetof -#if !defined(Q_CC_MSVC) || (_MSC_VER >= 1910) -static_assert(offsetof(QVector4DOld, x) == offsetof(QVector4DNew, v) + sizeof(QVector4DNew::v[0]) * 0, "Binary compatibility break in QVector4D"); -static_assert(offsetof(QVector4DOld, y) == offsetof(QVector4DNew, v) + sizeof(QVector4DNew::v[0]) * 1, "Binary compatibility break in QVector4D"); -static_assert(offsetof(QVector4DOld, z) == offsetof(QVector4DNew, v) + sizeof(QVector4DNew::v[0]) * 2, "Binary compatibility break in QVector4D"); -static_assert(offsetof(QVector4DOld, w) == offsetof(QVector4DNew, v) + sizeof(QVector4DNew::v[0]) * 3, "Binary compatibility break in QVector4D"); -#endif - - -} // anonymous namespace - /*! \class QVector4D \brief The QVector4D class represents a vector or vertex in 4D space. |
