From 59fc64cfc5139a66b69222ab3bd5389438e90f2f Mon Sep 17 00:00:00 2001 From: Mikhail Svetkin Date: Thu, 30 Aug 2018 12:46:40 +0200 Subject: [PATCH] QOffsetStringArray/msvc: fix compilation warnings C4100 C4100 - identifier' : unreferenced formal parameter It happens when we call StaticStringBuilder::concatenate(StaticString, StaticString<0>). StaticString<0> is ignored. Change-Id: Ic687bc865aa5d5e7425cbddbd614bde7dbb801df Reviewed-by: Thiago Macieira --- src/corelib/tools/qoffsetstringarray_p.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index 42ce2acb19b..1dc429a9bdc 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -106,12 +106,18 @@ struct StaticStringBuilder; template struct StaticStringBuilder, IndexesList> { + +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 static constexpr StaticString concatenate( const char (&ls)[N1], const T2 &rs) noexcept { return {ls[I1]..., rs.data[I2]...}; } +QT_WARNING_POP }; template