From 39a485512aa72ac9da1c0bd6c90bf74ac4598d43 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 2 Oct 2006 09:00:12 +0000 Subject: [PATCH] put expdecl in the correct place in DECLARE/IMPLEMENT_VARIANT_OBJECT_EXPORTED git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/variant.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/variant.h b/include/wx/variant.h index 0e3e71f195..37ecf447d3 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -326,8 +326,8 @@ private: DECLARE_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE) #define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ -classname& expdecl operator << ( classname &object, const wxVariant &variant ); \ -wxVariant& expdecl operator << ( wxVariant &variant, const classname &object ); +expdecl classname& operator << ( classname &object, const wxVariant &variant ); \ +expdecl wxVariant& operator << ( wxVariant &variant, const classname &object ); #define IMPLEMENT_VARIANT_OBJECT(classname) \ IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE) @@ -374,7 +374,7 @@ wxClassInfo* classname##VariantData::GetValueClassInfo()\ return m_value.GetClassInfo();\ }\ \ -classname& expdecl operator << ( classname &value, const wxVariant &variant )\ +expdecl classname& operator << ( classname &value, const wxVariant &variant )\ {\ wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\ \ @@ -383,7 +383,7 @@ classname& expdecl operator << ( classname &value, const wxVariant &variant )\ return value;\ }\ \ -wxVariant& expdecl operator << ( wxVariant &variant, const classname &value )\ +expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\ {\ classname##VariantData *data = new classname##VariantData( value );\ variant.SetData( data );\ -- 2.45.2