summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qendian.qdoc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-05-26 09:40:39 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2016-05-26 13:04:32 +0200
commit2fb026d58b45f50ed7d5666de58c9184e81bbc60 (patch)
treead1a80d7e2579899c55fce7771472a7d9176af0e /src/corelib/global/qendian.qdoc
parent184b2ea4ea9c3e4ad735ff67c5a399e9613da8ab (diff)
parent540978288ea0f6ed0b166bb9207f427a4c825ab6 (diff)
Merge remote-tracking branch 'origin/5.6.1' into 5.7.0
Conflicts: src/corelib/tools/qsimd_p.h src/network/socket/qnativesocketengine_winrt.cpp Change-Id: I2765b671664c2a84839b2f88ba724fdf0c1fa7c6
Diffstat (limited to 'src/corelib/global/qendian.qdoc')
-rw-r--r--src/corelib/global/qendian.qdoc23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/corelib/global/qendian.qdoc b/src/corelib/global/qendian.qdoc
index 63d924211f..3b22dcec87 100644
--- a/src/corelib/global/qendian.qdoc
+++ b/src/corelib/global/qendian.qdoc
@@ -34,6 +34,29 @@
*/
/*!
+ \internal
+ \fn T qFromUnaligned(const uchar *ptr)
+ \since 5.5
+
+ Loads a \c{T} from address \a ptr, which may be misaligned.
+
+ Use of this function avoids the undefined behavior that the C++ standard
+ otherwise attributes to unaligned loads.
+*/
+
+/*!
+ \internal
+ \fn void qToUnaligned(T t, uchar *ptr)
+ \since 4.5
+
+ Stores \a t to address \a ptr, which may be misaligned.
+
+ Use of this function avoids the undefined behavior that the C++ standard
+ otherwise attributes to unaligned stores.
+*/
+
+
+/*!
\fn T qFromBigEndian(const uchar *src)
\since 4.3
\relates <QtEndian>