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

Merge branch 'default-keyword' of git://github.com/MaartenBent/wxWidgets

Browse Source 
Remove wxMEMBER_DEFAULT and just "= default" instead.

See https://github.com/wxWidgets/wxWidgets/pull/1794
This commit is contained in:
Vadim Zeitlin
2020-04-15 02:17:06 +02:00
parent 4d7000d3d4 9039340da9
commit fe7de63730
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/doxygen/mainpages/const_cpp.h
View File

@@ -172,8 +172,7 @@ Currently the following symbols exist:
@itemdef{wxHAS_CONFIG_TEMPLATE_RW, Defined if the currently used compiler @itemdef{wxHAS_CONFIG_TEMPLATE_RW, Defined if the currently used compiler
supports template Read() and Write() methods in wxConfig.} supports template Read() and Write() methods in wxConfig.}
@itemdef{wxHAS_MEMBER_DEFAULT, Defined if the currently used compiler supports @itemdef{wxHAS_MEMBER_DEFAULT, Defined if the currently used compiler supports
C++11 @c =default. @c wxMEMBER_DEFAULT is defined as this keyword in this C++11 @c =default.}
case, and as nothing otherwise.}
@itemdef{wxHAS_LARGE_FILES, Defined if wxFile supports files more than 4GB in @itemdef{wxHAS_LARGE_FILES, Defined if wxFile supports files more than 4GB in
size (notice that you must include @c wx/filefn.h before testing for this size (notice that you must include @c wx/filefn.h before testing for this
symbol).} symbol).}

4
include/wx/animate.h
View File

@@ -39,8 +39,8 @@ public:
explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY); explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
#ifdef wxHAS_MEMBER_DEFAULT #ifdef wxHAS_MEMBER_DEFAULT
wxAnimation(const wxAnimation&) wxMEMBER_DEFAULT; wxAnimation(const wxAnimation&) = default;
wxAnimation& operator=(const wxAnimation&) wxMEMBER_DEFAULT; wxAnimation& operator=(const wxAnimation&) = default;
#endif #endif
bool IsOk() const; bool IsOk() const;

3
include/wx/defs.h
View File

@@ -290,13 +290,10 @@ typedef short int WXTYPE;
still requires handling MSVS specially, unfortunately) */ still requires handling MSVS specially, unfortunately) */
#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14) #if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14)
#define wxHAS_MEMBER_DEFAULT #define wxHAS_MEMBER_DEFAULT
#define wxMEMBER_DEFAULT = default
#define wxHAS_NOEXCEPT #define wxHAS_NOEXCEPT
#define wxNOEXCEPT noexcept #define wxNOEXCEPT noexcept
#else #else
#define wxMEMBER_DEFAULT
#define wxNOEXCEPT #define wxNOEXCEPT
#endif #endif

2
include/wx/unichar.h
View File

@@ -268,7 +268,7 @@ public:
{ if (&c != this) *this = c.UniChar(); return *this; } { if (&c != this) *this = c.UniChar(); return *this; }
#ifdef wxHAS_MEMBER_DEFAULT #ifdef wxHAS_MEMBER_DEFAULT
wxUniCharRef(const wxUniCharRef&) wxMEMBER_DEFAULT; wxUniCharRef(const wxUniCharRef&) = default;
#endif #endif
#define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \ #define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \