Merge branch 'master' of https://github.com/romixlab/qmsgpack

src/msgpackcommon.h

@@ -4,10 +4,6 @@
 #include <QVariant>
 #include <QtGlobal>
 
-#ifdef Q_OS_WINRT
-#include <stdint.h>
-#endif
-
 #define MSGPACK_MAJOR 0
 #define MSGPACK_MINOR 1
 #define MSGPACK_VERSION 0

src/private/pack_p.cpp

@@ -18,7 +18,9 @@ QReadWriteLock MsgPackPrivate::packers_lock;
 quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr, QVector<QByteArray> &user_data)
 {
     QMetaType::Type t = (QMetaType::Type)v.type();
-    if (t == QMetaType::Int)
+    if (v.isNull() && !v.isValid())
+        p = pack_nil(p, wr);
+    else if (t == QMetaType::Int)
         p = pack_int(v.toInt(), p, wr);
     else if (t == QMetaType::UInt)
         p = pack_uint(v.toUInt(), p, wr);
@@ -59,6 +61,12 @@ quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr, QVector<QByt
     return p;
 }
 
+quint8 *MsgPackPrivate::pack_nil(quint8 *p, bool wr)
+{
+    if (wr) *p = MsgPack::FirstByte::NIL;
+    return p + 1;
+}
+
 quint8 *MsgPackPrivate::pack_int(qint32 i, quint8 *p, bool wr)
 {
     if (i >= -32 && i <= 127) {

src/private/pack_p.h

@@ -27,6 +27,8 @@ extern bool compatibilityMode;
 
 quint8 * pack(const QVariant &v, quint8 *p, bool wr, QVector<QByteArray> &user_data);
 
+quint8 * pack_nil(quint8 *p, bool wr);
+
 quint8 * pack_int(qint32 i, quint8 *p, bool wr);
 quint8 * pack_uint(quint32 i, quint8 *p, bool wr);
 quint8 * pack_longlong(qint64 i, quint8 *p, bool wr);

src/private/unpack_p.cpp

@@ -87,6 +87,7 @@ quint8 * MsgPackPrivate::unpack_nil(QVariant &v, quint8 *p)
 {
     Q_UNUSED(p)
     Q_UNUSED(v)
+    v = QVariant();
     return p + 1;
 }
 
@@ -94,6 +95,7 @@ quint8 * MsgPackPrivate::unpack_never_used(QVariant &v, quint8 *p)
 {
     Q_UNUSED(p)
     Q_UNUSED(v)
+    v = QVariant();
     return p + 1;
 }