Merge branch 'default-keyword' of git://github.com/MaartenBent/wxWidgets
Remove wxMEMBER_DEFAULT and just "= default" instead. See https://github.com/wxWidgets/wxWidgets/pull/1794
This commit is contained in:
@@ -172,8 +172,7 @@ Currently the following symbols exist:
|
||||
@itemdef{wxHAS_CONFIG_TEMPLATE_RW, Defined if the currently used compiler
|
||||
supports template Read() and Write() methods in wxConfig.}
|
||||
@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
|
||||
case, and as nothing otherwise.}
|
||||
C++11 @c =default.}
|
||||
@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
|
||||
symbol).}
|
||||
|
@@ -39,8 +39,8 @@ public:
|
||||
explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
|
||||
|
||||
#ifdef wxHAS_MEMBER_DEFAULT
|
||||
wxAnimation(const wxAnimation&) wxMEMBER_DEFAULT;
|
||||
wxAnimation& operator=(const wxAnimation&) wxMEMBER_DEFAULT;
|
||||
wxAnimation(const wxAnimation&) = default;
|
||||
wxAnimation& operator=(const wxAnimation&) = default;
|
||||
#endif
|
||||
|
||||
bool IsOk() const;
|
||||
|
@@ -290,13 +290,10 @@ typedef short int WXTYPE;
|
||||
still requires handling MSVS specially, unfortunately) */
|
||||
#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14)
|
||||
#define wxHAS_MEMBER_DEFAULT
|
||||
#define wxMEMBER_DEFAULT = default
|
||||
|
||||
#define wxHAS_NOEXCEPT
|
||||
#define wxNOEXCEPT noexcept
|
||||
#else
|
||||
#define wxMEMBER_DEFAULT
|
||||
|
||||
#define wxNOEXCEPT
|
||||
#endif
|
||||
|
||||
|
@@ -268,7 +268,7 @@ public:
|
||||
{ if (&c != this) *this = c.UniChar(); return *this; }
|
||||
|
||||
#ifdef wxHAS_MEMBER_DEFAULT
|
||||
wxUniCharRef(const wxUniCharRef&) wxMEMBER_DEFAULT;
|
||||
wxUniCharRef(const wxUniCharRef&) = default;
|
||||
#endif
|
||||
|
||||
#define wxUNICHAR_REF_DEFINE_OPERATOR_EQUAL(type) \
|
||||
|
Reference in New Issue
Block a user