diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-07-26 14:41:42 +0200 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-10-16 18:32:18 +0000 |
| commit | b472e73b02b5a207ac37e32cc107d1046099f49f (patch) | |
| tree | c3f69cb60bf546b05befffc5e9c4499387aba24a /src/corelib/tools | |
| parent | 0014d81b1907621ea567ee157fc85113744a6af2 (diff) | |
qdbuserror: Use qOffsetStringArray instead of script generated code
Change-Id: I2498702bcf4706cb717a7481cf6f81ceebb29ae8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index c40970c0a6..5ca2200091 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -123,6 +123,8 @@ constexpr StaticString<0> staticString() noexcept return StaticString<0>{}; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4503) template<int Sum, int I, int ... Ix> constexpr StaticString<Sum> staticString(const char (&s)[I], const char (&...sx)[Ix]) noexcept { @@ -130,6 +132,7 @@ constexpr StaticString<Sum> staticString(const char (&s)[I], const char (&...sx) makeIndexSequence<I>, makeIndexSequence<Sum - I>>::concatenate(s, staticString<Sum - I>(sx...)); } +QT_WARNING_POP } // namespace QtPrivate template<typename T, int SizeString, int SizeOffsets> |