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

Handle wxLongLong wxConvertAnyToVariant only if wxUSE_LONGLONG==1.

Browse Source 
Code responsible for handling wxLongLong datatype in wxConvertAnyToVariant()
should be active only if wxUSE_LONGLONG is enabled.

See #16939.
This commit is contained in:
Artur Wieczorek
2015-04-03 21:50:38 +02:00
committed by Vadim Zeitlin
parent d8922744cf
commit 01dde21e68
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/any.cpp
View File

@@ -146,7 +146,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
// and others to "longlong". // and others to "longlong".
if ( wxANY_CHECK_TYPE(any, signed int) ) if ( wxANY_CHECK_TYPE(any, signed int) )
{ {
#ifdef wxLongLong_t #if defined(wxLongLong_t) && wxUSE_LONGLONG
wxLongLong_t ll = 0; wxLongLong_t ll = 0;
if ( any.GetAs(&ll) ) if ( any.GetAs(&ll) )
{ {
@@ -264,7 +264,7 @@ bool wxAnyValueTypeImplInt::ConvertValue(const wxAnyValueBuffer& src,
wxAnyBaseIntType value = GetValue(src); wxAnyBaseIntType value = GetValue(src);
if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
{ {
#ifdef wxLongLong_t #if defined(wxLongLong_t) && wxUSE_LONLONG
wxLongLong ll(value); wxLongLong ll(value);
wxString s = ll.ToString(); wxString s = ll.ToString();
#else #else
@@ -302,7 +302,7 @@ bool wxAnyValueTypeImplUint::ConvertValue(const wxAnyValueBuffer& src,
wxAnyBaseUintType value = GetValue(src); wxAnyBaseUintType value = GetValue(src);
if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) ) if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
{ {
#ifdef wxLongLong_t #if defined(wxLongLong_t) && wxUSE_LONGLONG
wxULongLong ull(value); wxULongLong ull(value);
wxString s = ull.ToString(); wxString s = ull.ToString();
#else #else