diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-08-30 12:46:40 +0200 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-09-07 08:29:22 +0000 |
| commit | 59fc64cfc5139a66b69222ab3bd5389438e90f2f (patch) | |
| tree | 97ad2246b4fb2ec53f8d834dc76a3204634a019f /src/corelib/tools | |
| parent | f21330b7497db846deb0c16a8e70ac1fecb522ba (diff) | |
QOffsetStringArray/msvc: fix compilation warnings C4100
C4100 - identifier' : unreferenced formal parameter
It happens when we call StaticStringBuilder::concatenate(StaticString<N>, StaticString<0>).
StaticString<0> is ignored.
Change-Id: Ic687bc865aa5d5e7425cbddbd614bde7dbb801df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index 42ce2acb19..1dc429a9bd 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -106,12 +106,18 @@ struct StaticStringBuilder; template<int ... I1, int ... I2> struct StaticStringBuilder<IndexesList<I1...>, IndexesList<I2...>> { + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4100) // The formal parameter is not referenced in the body of the function. + // The unreferenced parameter is ignored. + // It happens when 'rs' is StaticString<0> template<int N1, typename T2> static constexpr StaticString<N1 + T2::size()> concatenate( const char (&ls)[N1], const T2 &rs) noexcept { return {ls[I1]..., rs.data[I2]...}; } +QT_WARNING_POP }; template<int Sum> |