From: Vadim Zeitlin Date: Fri, 3 Nov 2006 21:37:08 +0000 (+0000) Subject: use wxEMPTY_PARAMETER_VALUE to ensure that nested macro calls get correct number... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5ffa72f49ff5f551a35423d8ee3ea3094cd3445b?ds=inline 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) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/variant.h b/include/wx/variant.h index 3f92c4e234..ff6fc93a43 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -379,7 +379,7 @@ expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\ // implements a wxVariantData-derived class using for the Eq() method the // operator== which must have been provided by "classname" #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 \ {\ @@ -396,7 +396,7 @@ bool classname##VariantData::Eq(wxVariantData& data) const \ #define IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(classname) \ IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(classname, wxEMPTY_PARAMETER_VALUE) #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 \ {\