diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-09-04 12:31:10 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-09-05 18:29:10 +0200 |
| commit | 21c5eeba673694f865badfd137ee9fc474177ae0 (patch) | |
| tree | e9055b573b01507a824ab0adca657584cfa6fc64 /src/corelib/tools/qoffsetstringarray_p.h | |
| parent | 0f80b65a01fcb12ec44e337191273ecf4d7e12c1 (diff) | |
QOffsetStringArray: fix ambiguous qOffsetStringArray overloads
There are two qOffsetStringArray overloads: one in QT_NAMESPACE, the
other in QT_PREPEND_NAMESPACE(QtPrivate). In TUs which use using
namespace QtPrivate, a call to qOffsetStringArray() may become
ambiguous.
Fix by renaming the qOffsetStringArray() to makeOffsetStringArray().
Pick-to: 6.4 6.3 6.2
Change-Id: I242a969f363e230d6a8dfb048601a0c024724f6a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qoffsetstringarray_p.h')
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index a3b56badc6..aa25f575be 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -125,7 +125,7 @@ template <size_t KL, size_t VL> struct StaticMapEntry }; template <typename StringExtractor, typename... T> -constexpr auto qOffsetStringArray(StringExtractor extractString, const T &... entries) +constexpr auto makeOffsetStringArray(StringExtractor extractString, const T &... entries) { constexpr size_t Count = sizeof...(T); constexpr qsizetype StringLength = (sizeof(extractString(T{})) + ...); @@ -147,7 +147,7 @@ template<int ... Nx> constexpr auto qOffsetStringArray(const char (&...strings)[Nx]) noexcept { auto extractString = [](const auto &s) -> decltype(auto) { return s; }; - return QtPrivate::qOffsetStringArray(extractString, QtPrivate::StaticString(strings)...); + return QtPrivate::makeOffsetStringArray(extractString, QtPrivate::StaticString(strings)...); } QT_WARNING_POP |