1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qminmax.h: move QTypeTraits part to qttypetraits.h

Browse Source 
Makes sense to collect the stuff in a similarly-named header.

Change-Id: Ic4190932a32fa06f1219473583327424dd2a8c11
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2024-05-29 09:33:39 +02:00
parent 358effb7a3
commit ccb8efbfe5
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/global/qminmax.h
View File

@ -11,31 +11,10 @@
#include <QtCore/qassert.h>
#include <QtCore/qtconfigmacros.h>
#include <type_traits>
#include <QtCore/qttypetraits.h>
QT_BEGIN_NAMESPACE
namespace QTypeTraits {
namespace detail {
template<typename T, typename U,
typename = std::enable_if_t<std::is_arithmetic_v<T> && std::is_arithmetic_v<U> &&
std::is_floating_point_v<T> == std::is_floating_point_v<U> &&
std::is_signed_v<T> == std::is_signed_v<U> &&
!std::is_same_v<T, bool> && !std::is_same_v<U, bool> &&
!std::is_same_v<T, char> && !std::is_same_v<U, char>>>
struct Promoted
{
using type = decltype(T() + U());
};
}
template <typename T, typename U>
using Promoted = typename detail::Promoted<T, U>::type;
}
template <typename T>
constexpr inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; }
template <typename T>

20
src/corelib/global/qttypetraits.h
View File

@ -60,6 +60,26 @@ template <typename T> struct type_dependent_false : std::false_type {};
template <auto T> struct value_dependent_false : std::false_type {};
}
namespace QTypeTraits {
namespace detail {
template<typename T, typename U,
typename = std::enable_if_t<std::is_arithmetic_v<T> && std::is_arithmetic_v<U> &&
std::is_floating_point_v<T> == std::is_floating_point_v<U> &&
std::is_signed_v<T> == std::is_signed_v<U> &&
!std::is_same_v<T, bool> && !std::is_same_v<U, bool> &&
!std::is_same_v<T, char> && !std::is_same_v<U, char>>>
struct Promoted
{
using type = decltype(T() + U());
};
}
template <typename T, typename U>
using Promoted = typename detail::Promoted<T, U>::type;
} // namespace QTypeTraits
QT_END_NAMESPACE
#endif // QTTYPETRAITS_H