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

use wxEMPTY_PARAMETER_VALUE to ensure that nested macro calls get correct number of parameters even when expdecl passed to the outer macro is empty (as happens in static builds)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-03 21:37:08 +00:00
parent b158be6e47
commit 5ffa72f49f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/variant.h
View File

@@ -379,7 +379,7 @@ expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\
// implements a wxVariantData-derived class using for the Eq() method the // implements a wxVariantData-derived class using for the Eq() method the
// operator== which must have been provided by "classname" // operator== which must have been provided by "classname"
#define IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ #define IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,expdecl) \
IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,expdecl) \ IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
\ \
bool classname##VariantData::Eq(wxVariantData& data) const \ bool classname##VariantData::Eq(wxVariantData& data) const \
{\ {\
@@ -396,7 +396,7 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
#define IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(classname) \ #define IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(classname) \
IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname, wxEMPTY_PARAMETER_VALUE) IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname, wxEMPTY_PARAMETER_VALUE)
#define IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname,expdecl) \ #define IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname,expdecl) \
IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,expdecl) \ IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
\ \
bool classname##VariantData::Eq(wxVariantData& data) const \ bool classname##VariantData::Eq(wxVariantData& data) const \
{\ {\