1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOffsetStringArray/msvc: fix compilation warnings C4100

Browse Source 
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>
This commit is contained in:
Mikhail Svetkin 2018-08-30 12:46:40 +02:00
parent f21330b749
commit 59fc64cfc5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qoffsetstringarray_p.h
View File

@ -106,12 +106,18 @@ struct StaticStringBuilder;
template<int ... I1, int ... I2> template<int ... I1, int ... I2>
struct StaticStringBuilder<IndexesList<I1...>, IndexesList<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> template<int N1, typename T2>
static constexpr StaticString<N1 + T2::size()> concatenate( static constexpr StaticString<N1 + T2::size()> concatenate(
const char (&ls)[N1], const T2 &rs) noexcept const char (&ls)[N1], const T2 &rs) noexcept
{ {
return {ls[I1]..., rs.data[I2]...}; return {ls[I1]..., rs.data[I2]...};
} }
QT_WARNING_POP
}; };
template<int Sum> template<int Sum>