diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-02 05:59:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-02 06:01:25 +0200 |
| commit | 688f70634cfe18fd215a958ef339e883aef5d4a3 (patch) | |
| tree | d17d5f2fdb65f8a0bff241274d543ccbe57f7bcc /src/corelib/tools/qsimd.cpp | |
| parent | bbb440bab261fecc7c9baf779dadf36659d3cf6f (diff) | |
| parent | 540978288ea0f6ed0b166bb9207f427a4c825ab6 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
This merge also blacklists a flaky tst_QGL::clipTest test on
OpenSUSE 13.1.
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
tests/auto/opengl/qgl/BLACKLIST
Task-number: QTBUG-53133
Change-Id: I14b431aa5a189b7dd1d3e2dfff767d15df20fde3
Diffstat (limited to 'src/corelib/tools/qsimd.cpp')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index ac28832c31..334e37b674 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -720,26 +720,4 @@ void qDumpCPUFeatures() puts(""); } -/*! - \internal - \fn T qUnalignedLoad(const void *ptr) - \since 5.6.1 - - Loads a \c{T} from address \a ptr, which may be misaligned. - - Use of this function avoid the undefined behavior that the C++ standard - otherwise attributes to unaligned loads. -*/ - -/*! - \internal - \fn void qUnalignedStore(void *ptr, T t) - \since 5.6.1 - - Stores \a t to address \a ptr, which may be misaligned. - - Use of this function avoid the undefined behavior that the C++ standard - otherwise attributes to unaligned stores. -*/ - QT_END_NAMESPACE |