Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cxx20-warning-fixes'

Browse Source 
Build fixes for gcc 11 and clang 12, including in C++ 20 mode.

See https://github.com/wxWidgets/wxWidgets/pull/2347
This commit is contained in:
Vadim Zeitlin
2021-04-26 16:10:33 +02:00
parent 86d1a25624 95c98a0b5f
commit 84bcc109ad
14 changed files with 104 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/gtk/dataform.h
View File

@@ -33,15 +33,18 @@ public:
wxDataFormat& operator=(NativeFormat format)
{ SetId(format); return *this; }
// comparison (must have both versions)
// comparison (note that we rely on implicit conversions for comparison
// with wxDataFormatId, but have to provide them explicitly for comparison
// with NativeFormat to avoid ambiguity between comparing from it to
// wxDataFormat or vice versa)
bool operator==(NativeFormat format) const
{ return m_format == (NativeFormat)format; }
bool operator!=(NativeFormat format) const
{ return m_format != (NativeFormat)format; }
bool operator==(wxDataFormatId format) const
{ return m_type == (wxDataFormatId)format; }
bool operator!=(wxDataFormatId format) const
{ return m_type != (wxDataFormatId)format; }
bool operator==(const wxDataFormat& other) const
{ return m_format == other.m_format; }
bool operator!=(const wxDataFormat& other) const
{ return m_format != other.m_format; }
// explicit and implicit conversions to NativeFormat which is one of
// standard data types (implicit conversion is useful for preserving the