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

Fix macros in xti.cpp

Browse Source 
Replaced `wxToStringConverter<type, data, result)` with
`wxFromStringConverter<type>(data, result)`, which was broken
for 7 years since the commit 13830d6

This fixes compilation with `--enable-extended_rtti` configure flag.

Also removed all trailing spaces in this file.
This commit is contained in:
pavelxdd
2017-11-25 08:52:01 +03:00
parent a065e98a22
commit 4156634b24
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/xti.cpp
View File

@@ -269,10 +269,10 @@ template<> void wxStringWriteValue(wxString &s, const wxString &data )
&wxFromStringConverter<type>, typeid(type).name()); &wxFromStringConverter<type>, typeid(type).name());
#else #else
#define wxBUILTIN_TYPE_INFO( element, type ) \ #define wxBUILTIN_TYPE_INFO( element, type ) \
void _toString##element( const wxAny& data, wxString &result ) \ void _toString##element( const wxAny& data, wxString &result ) \
{ wxToStringConverter<type, data, result); } \ { wxToStringConverter<type>(data, result); } \
void _fromString##element( const wxString& data, wxAny &result ) \ void _fromString##element( const wxString& data, wxAny &result ) \
{ wxFromStringConverter<type, data, result); } \ { wxFromStringConverter<type>(data, result); } \
wxBuiltInTypeInfo s_typeInfo##type(element, &_toString##element, \ wxBuiltInTypeInfo s_typeInfo##type(element, &_toString##element, \
&_fromString##element, typeid(type).name()); &_fromString##element, typeid(type).name());
#endif #endif