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

QCborValue: Disable support for spaceship operator

Browse Source 
__has_include(<compare>) is not the correct way to detect this feature,
since that's a library header and may be provided by an implementation
(libc++) before the compiler supports the syntax.

Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Thiago Macieira 2018-07-25 19:04:20 -07:00
parent bd0279c417
commit 1555894dec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/serialization/qcborarray.h
View File

@ -207,7 +207,7 @@ public:
bool contains(const QCborValue &value) const;
int compare(const QCborArray &other) const noexcept Q_DECL_PURE_FUNCTION;
#if QT_HAS_INCLUDE(<compare>)
#if 0 && QT_HAS_INCLUDE(<compare>)
std::strong_ordering operator<=>(const QCborArray &other) const
{
int c = compare(other);

2
src/corelib/serialization/qcbormap.h
View File

@ -233,7 +233,7 @@ public:
{ const_iterator it = find(key); return it != end(); }
int compare(const QCborMap &other) const noexcept Q_DECL_PURE_FUNCTION;
#if QT_HAS_INCLUDE(<compare>)
#if 0 && QT_HAS_INCLUDE(<compare>)
std::strong_ordering operator<=>(const QCborMap &other) const
{
int c = compare(other);

6
src/corelib/serialization/qcborvalue.h
View File

@ -57,7 +57,7 @@
# undef False
#endif
#if QT_HAS_INCLUDE(<compare>)
#if 0 && QT_HAS_INCLUDE(<compare>)
# include <compare>
#endif
@ -252,7 +252,7 @@ public:
const QCborValue operator[](qint64 key) const;
int compare(const QCborValue &other) const;
#if QT_HAS_INCLUDE(<compare>)
#if 0 && QT_HAS_INCLUDE(<compare>)
std::strong_ordering operator<=>(const QCborValue &other) const
{
int c = compare(other);
@ -398,7 +398,7 @@ public:
int compare(const QCborValue &other) const
{ return concrete().compare(other); }
#if QT_HAS_INCLUDE(<compare>)
#if 0 && QT_HAS_INCLUDE(<compare>)
std::strong_ordering operator<=>(const QCborValue &other) const
{
int c = compare(other);