feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: If3ada34dcc764fa1d0cce04fd343fb5a02c2fbaa
This commit is contained in:
Eike Ziller
2023-07-10 09:29:51 +02:00
parent 9039ede034 3745394fde
commit 3d3c78dfc6
61 changed files with 830 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/algorithm.h
View File

@@ -218,14 +218,6 @@ OutputContainer setUnionMerge(InputContainer1 &&input1,
template<class OutputContainer, class InputContainer1, class InputContainer2, class Merge>
OutputContainer setUnionMerge(InputContainer1 &&input1, InputContainer2 &&input2, Merge merge);
/////////////////////////
// usize / ssize
/////////////////////////
template<typename Container>
std::make_unsigned_t<typename Container::size_type> usize(Container container);
template<typename Container>
std::make_signed_t<typename Container::size_type> ssize(Container container);
/////////////////////////
// setUnion
/////////////////////////
@@ -1340,15 +1332,15 @@ OutputContainer setUnionMerge(InputContainer1 &&input1,
}
template<typename Container>
std::make_unsigned_t<typename Container::size_type> usize(Container container)
auto usize(const Container &container)
{
return static_cast<std::make_unsigned_t<typename Container::size_type>>(container.size());
return static_cast<std::make_unsigned_t<decltype(std::size(container))>>(std::size(container));
}
template<typename Container>
std::make_signed_t<typename Container::size_type> ssize(Container container)
auto ssize(const Container &container)
{
return static_cast<std::make_signed_t<typename Container::size_type>>(container.size());
return static_cast<std::make_signed_t<decltype(std::size(container))>>(std::size(container));
}
template<typename Compare>