AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QOffsetStringArray: fix compilation error with clang-802.0.42

Browse Source 
error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
  return StaticString<N1 + N2>{ls[I1]..., rs.data[I2]...};

Change-Id: I30f5f50378f1faed648d092eefc5edb46e940239
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mikhail Svetkin 2018-10-01 11:57:28 +02:00 committed by Liang Qi
parent 2e02692ec2
commit 73bc1cf92f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ QT_WARNING_DISABLE_MSVC(4100) // The formal parameter is not referenced in the b
static constexpr StaticString<N1 + N2> concatenate( static constexpr StaticString<N1 + N2> concatenate(
const char (&ls)[N1], const StaticString<N2> &rs) noexcept const char (&ls)[N1], const StaticString<N2> &rs) noexcept
{ {
return StaticString<N1 + N2>{ls[I1]..., rs.data[I2]...}; return StaticString<N1 + N2>{{ls[I1]..., rs.data[I2]...}};
} }
QT_WARNING_POP QT_WARNING_POP
}; };