Merge branch 'atp' of https://github.com/birarda/hifi into protocol

This commit is contained in:
Atlante45 2015-07-08 19:17:14 -07:00
commit 405e4f37ab

View file

@ -57,11 +57,11 @@ private:
QByteArray _extendedHeader; QByteArray _extendedHeader;
}; };
template <typename T> template <typename U> PacketList<T>::readPrimitive(U* data) { template <typename T> template <typename U> qint64 PacketList<T>::readPrimitive(U* data) {
return QIODevice::read(reinterpret_cast<char*>(data), sizeof(U)); return QIODevice::read(reinterpret_cast<char*>(data), sizeof(U));
} }
template <typename T> template <typename U> PacketList<T>::writePrimitive(const U& data) { template <typename T> template <typename U> qint64 PacketList<T>::writePrimitive(const U& data) {
static_assert(!std::is_pointer<U>::value, "U must not be a pointer"); static_assert(!std::is_pointer<U>::value, "U must not be a pointer");
return QIODevice::write(reinterpret_cast<const char*>(&data), sizeof(U)); return QIODevice::write(reinterpret_cast<const char*>(&data), sizeof(U));
} }