From a432683e0ce7a6cace498db26ee268af1e47e7bf Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 8 Nov 2016 17:25:25 +0100
Subject: [PATCH] QmlProfiler: Mark various number writing/reading functions
inline
The compiler does not necessarily get it automatically.
Change-Id: Id37c20960a66775e34b80cbbe666e22505c5b347
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
src/plugins/qmlprofiler/qmlevent.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qmlprofiler/qmlevent.cpp b/src/plugins/qmlprofiler/qmlevent.cpp
index 225186df25f..2d069337193 100644
--- a/src/plugins/qmlprofiler/qmlevent.cpp
+++ b/src/plugins/qmlprofiler/qmlevent.cpp
@@ -59,14 +59,14 @@ enum SerializationTypeOffset {
};
template<typename Number>
-static void readNumbers(QDataStream &stream, Number *data, quint16 length)
+static inline void readNumbers(QDataStream &stream, Number *data, quint16 length)
{
for (quint16 i = 0; i != length; ++i)
stream >> data[i];
}
template<typename Number>
-static Number readNumber(QDataStream &stream, qint8 type)
+static inline Number readNumber(QDataStream &stream, qint8 type)
{
switch (type) {
case OneByte: {
@@ -150,7 +150,7 @@ QDataStream &operator>>(QDataStream &stream, QmlEvent &event)
return stream;
}
-static qint8 minimumType(const QmlEvent &event, quint16 length, quint16 origBitsPerNumber)
+static inline qint8 minimumType(const QmlEvent &event, quint16 length, quint16 origBitsPerNumber)
{
qint8 type = OneByte;
bool ok = true;
@@ -182,7 +182,7 @@ static qint8 minimumType(const QmlEvent &event, quint16 length, quint16 origBits
}
template<typename Number>
-static qint8 minimumType(Number number)
+static inline qint8 minimumType(Number number)
{
if (static_cast<qint8>(number) == number)
return OneByte;
@@ -194,14 +194,14 @@ static qint8 minimumType(Number number)
}
template<typename Number>
-static void writeNumbers(QDataStream &stream, const QmlEvent &event, quint16 length)
+static inline void writeNumbers(QDataStream &stream, const QmlEvent &event, quint16 length)
{
for (quint16 i = 0; i != length; ++i)
stream << event.number<Number>(i);
}
template<typename Number>
-static void writeNumber(QDataStream &stream, Number number, qint8 type)
+static inline void writeNumber(QDataStream &stream, Number number, qint8 type)
{
switch (type) {
case OneByte:
--
GitLab