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

Use C++11 default copy ctor for wxUniCharRef

Browse Source 
It's a little simpler, and still suppresses -Wdeprecated-copy warnings
This commit is contained in:
Paul Cornett
2019-11-25 21:27:09 -08:00
parent 4990515aba
commit ae7fcc440c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/unichar.h
View File

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