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

Merge branch 'cmake-c++11-stl' of git://github.com/MaartenBent/wxWidgets

Browse Source 
CMake: Improve STL checks, improve C++17/20 support.

See https://github.com/wxWidgets/wxWidgets/pull/1782

Closes #18718.
This commit is contained in:
Vadim Zeitlin
2020-04-12 16:37:57 +02:00
parent ed077e17cf c96014db27
commit 413fdfbfa4
15 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/animate.h
View File

@@ -38,9 +38,9 @@ public:
wxAnimation();
explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
#if __cplusplus >= 201103
wxAnimation(const wxAnimation&) = default;
wxAnimation& operator=(const wxAnimation&) = default;
#ifdef wxHAS_MEMBER_DEFAULT
wxAnimation(const wxAnimation&) wxMEMBER_DEFAULT;
wxAnimation& operator=(const wxAnimation&) wxMEMBER_DEFAULT;
#endif
bool IsOk() const;

10
include/wx/defs.h
View File

@@ -285,6 +285,14 @@ typedef short int WXTYPE;
#define wxOVERRIDE
#endif /* HAVE_OVERRIDE */
/* same for defaulted member function keyword */
#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14)
#define wxHAS_MEMBER_DEFAULT
#define wxMEMBER_DEFAULT = default
#else
#define wxMEMBER_DEFAULT
#endif
/*
Support for nullptr is available since MSVS 2010, even though it doesn't
define __cplusplus as a C++11 compiler.
@@ -2994,7 +3002,7 @@ typedef const void* WXWidget;
/* macros to define a class without copy ctor nor assignment operator */
/* --------------------------------------------------------------------------- */
#if defined(__cplusplus) && __cplusplus >= 201103L
#if defined(__cplusplus) && (__cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(14))
#define wxMEMBER_DELETE = delete
#else
#define wxMEMBER_DELETE

4
include/wx/msw/rt/utils.h
View File

@@ -66,11 +66,9 @@ public:
operator HSTRING() const { return m_hstring; };
static const TempStringRef Make(const wxString &str);
TempStringRef(const wxString& str);
private:
TempStringRef(const wxString &str);
HSTRING m_hstring;
HSTRING_HEADER m_header;

4
include/wx/unichar.h
View File

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