wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 931571, part 3 - Rename return value of macro generated methods. r=froydnj

Browse Source
This commit is contained in:
Andrew McCreight 2015-07-23 12:28:29 -07:00
parent 06c877e501
commit 59986fc413
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xpcom/ds/nsVariant.cpp
View File

@ -467,9 +467,9 @@ bad:
#define NUMERIC_CONVERSION_METHOD_BEGIN(type_, Ctype_, name_) \ #define NUMERIC_CONVERSION_METHOD_BEGIN(type_, Ctype_, name_) \
/* static */ nsresult \ /* static */ nsresult \
nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \ nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \
Ctype_ *_retval) \ Ctype_* aResult) \
{ \ { \
TRIVIAL_DATA_CONVERTER(type_, data, m##name_##Value, _retval) \ TRIVIAL_DATA_CONVERTER(type_, data, m##name_##Value, aResult) \
nsDiscriminatedUnion tempData; \ nsDiscriminatedUnion tempData; \
nsresult rv = ToManageableNumber(data, &tempData); \ nsresult rv = ToManageableNumber(data, &tempData); \
/* */ \ /* */ \
@ -484,7 +484,7 @@ nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \
#define CASE__NUMERIC_CONVERSION_INT32_JUST_CAST(Ctype_) \ #define CASE__NUMERIC_CONVERSION_INT32_JUST_CAST(Ctype_) \
case nsIDataType::VTYPE_INT32: \ case nsIDataType::VTYPE_INT32: \
*_retval = ( Ctype_ ) tempData.u.mInt32Value; \ *aResult = ( Ctype_ ) tempData.u.mInt32Value; \
return rv; return rv;
#define CASE__NUMERIC_CONVERSION_INT32_MIN_MAX(Ctype_, min_, max_) \ #define CASE__NUMERIC_CONVERSION_INT32_MIN_MAX(Ctype_, min_, max_) \
@ -493,13 +493,13 @@ nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \
int32_t value = tempData.u.mInt32Value; \ int32_t value = tempData.u.mInt32Value; \
if(value < min_ || value > max_) \ if(value < min_ || value > max_) \
return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \ return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \
*_retval = ( Ctype_ ) value; \ *aResult = ( Ctype_ ) value; \
return rv; \ return rv; \
} }
#define CASE__NUMERIC_CONVERSION_UINT32_JUST_CAST(Ctype_) \ #define CASE__NUMERIC_CONVERSION_UINT32_JUST_CAST(Ctype_) \
case nsIDataType::VTYPE_UINT32: \ case nsIDataType::VTYPE_UINT32: \
*_retval = ( Ctype_ ) tempData.u.mUint32Value; \ *aResult = ( Ctype_ ) tempData.u.mUint32Value; \
return rv; return rv;
#define CASE__NUMERIC_CONVERSION_UINT32_MAX(Ctype_, max_) \ #define CASE__NUMERIC_CONVERSION_UINT32_MAX(Ctype_, max_) \
@ -508,13 +508,13 @@ nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \
uint32_t value = tempData.u.mUint32Value; \ uint32_t value = tempData.u.mUint32Value; \
if(value > max_) \ if(value > max_) \
return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \ return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \
*_retval = ( Ctype_ ) value; \ *aResult = ( Ctype_ ) value; \
return rv; \ return rv; \
} }
#define CASE__NUMERIC_CONVERSION_DOUBLE_JUST_CAST(Ctype_) \ #define CASE__NUMERIC_CONVERSION_DOUBLE_JUST_CAST(Ctype_) \
case nsIDataType::VTYPE_DOUBLE: \ case nsIDataType::VTYPE_DOUBLE: \
*_retval = ( Ctype_ ) tempData.u.mDoubleValue; \ *aResult = ( Ctype_ ) tempData.u.mDoubleValue; \
return rv; return rv;
#define CASE__NUMERIC_CONVERSION_DOUBLE_MIN_MAX(Ctype_, min_, max_) \ #define CASE__NUMERIC_CONVERSION_DOUBLE_MIN_MAX(Ctype_, min_, max_) \
@ -523,7 +523,7 @@ nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \
double value = tempData.u.mDoubleValue; \ double value = tempData.u.mDoubleValue; \
if(value < min_ || value > max_) \ if(value < min_ || value > max_) \
return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \ return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \
*_retval = ( Ctype_ ) value; \ *aResult = ( Ctype_ ) value; \
return rv; \ return rv; \
} }
@ -533,7 +533,7 @@ nsVariant::ConvertTo##name_ (const nsDiscriminatedUnion& data, \
double value = tempData.u.mDoubleValue; \ double value = tempData.u.mDoubleValue; \
if(value < min_ || value > max_) \ if(value < min_ || value > max_) \
return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \ return NS_ERROR_LOSS_OF_SIGNIFICANT_DATA; \
*_retval = ( Ctype_ ) value; \ *aResult = ( Ctype_ ) value; \
return (0.0 == fmod(value,1.0)) ? \ return (0.0 == fmod(value,1.0)) ? \
rv : NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA; \ rv : NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA; \
} }