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

QtCore/QCalendarRegistry: Move helper CaseInsensitiveAnyStringViewLessThan out of anonymous namespace

Browse Source 
It causes a warning in CMake Unity (Jumbo) builds:

src/corelib/time/qcalendar.cpp:46: warning:
QtPrivate::QCalendarRegistry has a field QtPrivate::QCalendarRegistry::byName whose type uses the anonymous namespace [-Wsubobject-linkage]

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ie9598c3e87dd835b06cafe5392766bddc258b5ec
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint 2023-01-26 15:13:02 +01:00 committed by Amir Masoud Abdol
parent 38b726830c
commit e63278bb38
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/time/qcalendar.cpp
View File

@ -25,9 +25,8 @@
QT_BEGIN_NAMESPACE
namespace {
struct CaseInsensitiveAnyStringViewLessThan {
struct QCalendarRegistryCaseInsensitiveAnyStringViewLessThan
{
struct is_transparent {};
bool operator()(QAnyStringView lhs, QAnyStringView rhs) const
{
@ -35,8 +34,6 @@ struct CaseInsensitiveAnyStringViewLessThan {
}
};
} // unnamed namespace
namespace QtPrivate {
/*
@ -70,7 +67,7 @@ class QCalendarRegistry
*/
QFlatMap<
QString, QCalendarBackend *,
CaseInsensitiveAnyStringViewLessThan,
QCalendarRegistryCaseInsensitiveAnyStringViewLessThan,
QStringList,
std::vector<QCalendarBackend *>
> byName;