romixlab/qmsgpack
1
0
Fork 1
mirror of https://github.com/romixlab/qmsgpack.git synced 2025-07-29 18:07:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI build.

Browse Source
This commit is contained in:
Roman Isaikin
2019-06-30 10:14:39 +03:00
parent 1733bc7847
commit 7e1ca5b414
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/private/pack_p.cpp
View File

@ -20,7 +20,11 @@ QReadWriteLock MsgPackPrivate::packers_lock;
quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr, QVector<QByteArray> &user_data) quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr, QVector<QByteArray> &user_data)
{ {
QMetaType::Type t = (QMetaType::Type)v.type(); QMetaType::Type t = (QMetaType::Type)v.type();
if ((v.isNull() && !v.isValid()) || t == 51) // QMetaType::Nullptr #if QT_VERSION > QT_VERSION_CHECK(5, 8, 0)
if ((v.isNull() && !v.isValid()) || t == QMetaType::Nullptr)
#else
if (v.isNull() && !v.isValid())
#endif
p = pack_nil(p, wr); p = pack_nil(p, wr);
else if (t == QMetaType::Int) else if (t == QMetaType::Int)
p = pack_int(v.toInt(), p, wr); p = pack_int(v.toInt(), p, wr);

11
tests/pack/pack_test.cpp
View File

@ -27,12 +27,19 @@ private Q_SLOTS:
void PackTest::test_nil() void PackTest::test_nil()
{ {
QVariant v; QVariant v;
v.setValue(nullptr);
QVERIFY((QMetaType::Type)v.type() == 51); // QMetaType::Nullptr
QByteArray arr = MsgPack::pack(v); QByteArray arr = MsgPack::pack(v);
quint8 *p = (quint8 *)arr.data(); quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1); QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0xc0); QVERIFY(p[0] == 0xc0);
#if QT_VERSION > QT_VERSION_CHECK(5, 8, 0)
v.setValue(nullptr);
QVERIFY((QMetaType::Type)v.type() == QMetaType::Nullptr);
arr = MsgPack::pack(v);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0xc0);
#endif
} }
void PackTest::test_bool() void PackTest::test_bool()