Add support for official Timestamp32 extension type, iOS compilation fix

qmsgpack.pri

@@ -21,12 +21,12 @@ HEADERS += \
 !contains(DEFINES, MSGPACK_NO_PACKTYPES) {
     SOURCES += \
         $$PWD/src/private/qt_types_p.cpp \
-        $$PWD/src/stream/time.cpp \
+        $$PWD/src/stream/datetime.cpp \
         $$PWD/src/stream/geometry.cpp
 
     HEADERS += \
         $$PWD/src/private/qt_types_p.h \
-        $$PWD/src/stream/time.h \
+        $$PWD/src/stream/datetime.h \
         $$PWD/src/stream/geometry.h
 
     qtHaveModule(gui) {

src/private/qt_types_p.cpp

@@ -5,7 +5,7 @@
 #include "unpack_p.h"
 #include "../msgpackstream.h"
 #include "../endianhelper.h"
-#include "../stream/time.h"
+#include "../stream/datetime.h"
 
 #include <QDebug>
 

src/private/unpack_p.cpp

@@ -4,6 +4,7 @@
 #include "../endianhelper.h"
 
 #include <QByteArray>
+#include <QDateTime>
 #include <QDebug>
 #include <QMap>
 #include <QReadLocker>
@@ -367,6 +368,9 @@ quint8 * MsgPackPrivate::unpack_fixext2(QVariant &v, quint8 *p)
 quint8 * MsgPackPrivate::unpack_fixext4(QVariant &v, quint8 *p)
 {
     qint8 type = static_cast<qint8>(*(++p));
+    if (type == -1) {
+        return unpack_timestamp32(v, p + 1);
+    }
     return unpack_ext(v, p + 1, type, 4);
 }
 
@@ -409,6 +413,12 @@ quint8 * MsgPackPrivate::unpack_ext32(QVariant &v, quint8 *p)
     return unpack_ext(v, p + 1, type, len);
 }
 
+quint8 * MsgPackPrivate::unpack_timestamp32(QVariant &v, quint8 *p)
+{
+    v = QDateTime::fromSecsSinceEpoch(_msgpack_load32(quint32, p));
+    return p + 4;
+}
+
 bool MsgPackPrivate::register_unpacker(qint8 msgpack_type, MsgPack::unpack_user_f unpacker)
 {
     if (unpacker == nullptr) {

src/private/unpack_p.h

@@ -75,6 +75,8 @@ quint8 * unpack_fixext16(QVariant &v, quint8 *p);
 quint8 * unpack_ext8(QVariant &v, quint8 *p);
 quint8 * unpack_ext16(QVariant &v, quint8 *p);
 quint8 * unpack_ext32(QVariant &v, quint8 *p);
+
+quint8 * unpack_timestamp32(QVariant &v, quint8 *p);
 }
 
 #endif // MSGPACK_P_H

src/stream/time.cpp → src/stream/datetime.cpp

@@ -1,6 +1,6 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
-#include "time.h"
+#include "datetime.h"
 #include "../msgpack.h"
 
 void MsgPackPrivate::pack_qtime_raw(const QTime &time, quint8 *p)

src/stream/time.h → src/stream/datetime.h

@@ -1,5 +1,5 @@
-#ifndef TIME_H
-#define TIME_H
+#ifndef DATETIME_H
+#define DATETIME_H
 
 #include "../msgpack_export.h"
 #include "../msgpackstream.h"
@@ -22,5 +22,5 @@ void pack_qdate_raw(const QDate &date, quint8 *p);
 QDate unpack_qdate_raw(quint8 *p);
 }
 
-#endif // TIME_H
+#endif // DATETIME_H