-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
static_cast<int> for qsizetype so std::max works #4391
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
QHash::count returns qsizetype rather than int in Qt6 [14/399] Building CXX object CMakeFiles/mixxx-lib.dir/src/library/dao/playlistdao.cpp.o FAILED: CMakeFiles/mixxx-lib.dir/src/library/dao/playlistdao.cpp.o /usr/bin/ccache /usr/bin/c++ -DHAVE_INET_ATON -DHAVE_INET_PTON -DHAVE_UNISTD_H -DMIXXX_BUILD_RELEASE -DNDEBUG -DPA_USE_ALSA -DQT_CONCURRENT_LIB -DQT_CORE5COMPAT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_PRINTSUPPORT_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICKWIDGETS_LIB -DQT_QUICK_LIB -DQT_SQL_LIB -DQT_SVGWIDGETS_LIB -DQT_SVG_LIB -DQT_TABLET_SUPPORT -DQT_TESTLIB_LIB -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -DQT_XML_LIB -D__BATTERY__ -D__BROADCAST__ -D__BULK__ -D__ENGINEPRIME__ -D__FAAD__ -D__FFMPEG__ -D__HID__ -D__KEYFINDER__ -D__LILV__ -D__LINUX__ -D__MAD__ -D__MODPLUG__ -D__MP4V2__ -D__OPUS__ -D__QTKEYCHAIN__ -D__SNDFILE__ -D__SQLITE3__ -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__UNIX__ -D__VINYLCONTROL__ -D__WV__ -Dx86_64 -Imixxx-lib_autogen/include -I../src -Isrc -I/usr/include/ffmpeg -isystem /home/be/local/include -isystem ../lib/fidlib -isystem ../lib/googletest/googletest/include -isystem ../lib/portaudio -isystem ../lib/rigtorp/SPSCQueue/include -isystem ../lib/replaygain -isystem ../lib/reverb -isystem /usr/include/glib-2.0 -isystem /usr/lib64/glib-2.0/include -isystem ../lib/libshout-idjc/include -isystem ../lib/kaitai -isystem ../lib/mp3guessenc-0.27.4 -isystem /usr/include/qt6/QtConcurrent -isystem /usr/include/qt6 -isystem /usr/include/qt6/QtCore -isystem /usr/lib64/qt6/mkspecs/linux-g++ -isystem /usr/include/qt6/QtGui -isystem /usr/include/qt6/QtNetwork -isystem /usr/include/qt6/QtOpenGL -isystem /usr/include/qt6/QtPrintSupport -isystem /usr/include/qt6/QtWidgets -isystem /usr/include/qt6/QtQml -isystem /usr/include/qt6/QtQuickWidgets -isystem /usr/include/qt6/QtQuick -isystem /usr/include/qt6/QtQmlModels -isystem /usr/include/qt6/QtSql -isystem /usr/include/qt6/QtSvg -isystem /usr/include/qt6/QtTest -isystem /usr/include/qt6/QtXml -isystem /usr/include/qt6/QtSvgWidgets -isystem /usr/include/qt6/QtCore5Compat -isystem /usr/include/qt6/QtDBus -isystem ../lib/qm-dsp -isystem ../lib/qm-dsp/include -isystem /usr/include/taglib -isystem /usr/include/libupower-glib -isystem /usr/include/lilv-0 -isystem /usr/include/opus -isystem /usr/include/hidapi -isystem /usr/include/libusb-1.0 -isystem ../lib/xwax -isystem /usr/include/wavpack -fdiagnostics-color=auto -O2 -g -DNDEBUG -fvisibility=hidden -fvisibility-inlines-hidden -pipe -O3 -ffast-math -funroll-loops -fomit-frame-pointer -mtune=generic -Wall -Wextra -Woverloaded-virtual -Wfloat-conversion -Werror=return-type -Wformat=2 -Wformat-security -Wvla -Wundef -DPA_USE_JACK=1 -pthread -DPA_USE_ALSA=1 -D_REENTRANT -std=gnu++17 -MD -MT CMakeFiles/mixxx-lib.dir/src/library/dao/playlistdao.cpp.o -MF CMakeFiles/mixxx-lib.dir/src/library/dao/playlistdao.cpp.o.d -o CMakeFiles/mixxx-lib.dir/src/library/dao/playlistdao.cpp.o -c ../src/library/dao/playlistdao.cpp ../src/library/dao/playlistdao.cpp: In member function ‘void PlaylistDAO::shuffleTracks(int, const QList<int>&, const QHash<int, TrackId>&)’: ../src/library/dao/playlistdao.cpp:969:40: error: no matching function for call to ‘max(qsizetype, int)’ 969 | const int searchDistance = math_max(trackPositionIds.count() / 4, 1); In file included from /usr/include/c++/11/algorithm:61, from /usr/include/qt6/QtCore/qglobal.h:126, from /usr/include/qt6/QtCore/qcontainertools_impl.h:50, from /usr/include/qt6/QtCore/qhash.h:44, from /usr/include/qt6/QtCore/QHash:1, from ../src/library/dao/playlistdao.h:3, from ../src/library/dao/playlistdao.cpp:1: /usr/include/c++/11/bits/stl_algobase.h:254:5: note: candidate: ‘template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)’ 254 | max(const _Tp& __a, const _Tp& __b) | ^~~ /usr/include/c++/11/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: ../src/library/dao/playlistdao.cpp:969:40: note: deduced conflicting types for parameter ‘const _Tp’ (‘long long int’ and ‘int’) 969 | const int searchDistance = math_max(trackPositionIds.count() / 4, 1); In file included from /usr/include/c++/11/algorithm:61, from /usr/include/qt6/QtCore/qglobal.h:126, from /usr/include/qt6/QtCore/qcontainertools_impl.h:50, from /usr/include/qt6/QtCore/qhash.h:44, from /usr/include/qt6/QtCore/QHash:1, from ../src/library/dao/playlistdao.h:3, from ../src/library/dao/playlistdao.cpp:1: /usr/include/c++/11/bits/stl_algobase.h:300:5: note: candidate: ‘template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)’ 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) | ^~~ /usr/include/c++/11/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: ../src/library/dao/playlistdao.cpp:969:40: note: deduced conflicting types for parameter ‘const _Tp’ (‘long long int’ and ‘int’) 969 | const int searchDistance = math_max(trackPositionIds.count() / 4, 1); In file included from /usr/include/c++/11/algorithm:62, from /usr/include/qt6/QtCore/qglobal.h:126, from /usr/include/qt6/QtCore/qcontainertools_impl.h:50, from /usr/include/qt6/QtCore/qhash.h:44, from /usr/include/qt6/QtCore/QHash:1, from ../src/library/dao/playlistdao.h:3, from ../src/library/dao/playlistdao.cpp:1: /usr/include/c++/11/bits/stl_algo.h:3461:5: note: candidate: ‘template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)’ 3461 | max(initializer_list<_Tp> __l) | ^~~ /usr/include/c++/11/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: ../src/library/dao/playlistdao.cpp:969:40: note: mismatched types ‘std::initializer_list<_Tp>’ and ‘long long int’ 969 | const int searchDistance = math_max(trackPositionIds.count() / 4, 1); In file included from /usr/include/c++/11/algorithm:62, from /usr/include/qt6/QtCore/qglobal.h:126, from /usr/include/qt6/QtCore/qcontainertools_impl.h:50, from /usr/include/qt6/QtCore/qhash.h:44, from /usr/include/qt6/QtCore/QHash:1, from ../src/library/dao/playlistdao.h:3, from ../src/library/dao/playlistdao.cpp:1: /usr/include/c++/11/bits/stl_algo.h:3467:5: note: candidate: ‘template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)’ 3467 | max(initializer_list<_Tp> __l, _Compare __comp) | ^~~ /usr/include/c++/11/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: ../src/library/dao/playlistdao.cpp:969:40: note: mismatched types ‘std::initializer_list<_Tp>’ and ‘long long int’ 969 | const int searchDistance = math_max(trackPositionIds.count() / 4, 1);
uklotzde
approved these changes
Oct 13, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
QHash::count returns qsizetype rather than int in Qt6