From 93994180626e0613dc20be44ab37a088eeb7e472 Mon Sep 17 00:00:00 2001 From: Marcelo Matus Date: Fri, 4 Nov 2005 10:57:16 +0000 Subject: [PATCH] simplify the ASPTR_ARGS and ASVAL_ARGS macros to one AS_ARG git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7796 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Lib/perl5/perltypemaps.swg | 7 ++----- SWIG/Lib/tcl/tcltypemaps.swg | 7 ++----- SWIG/Lib/typemaps/fragments.swg | 24 ++++++++---------------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/SWIG/Lib/perl5/perltypemaps.swg b/SWIG/Lib/perl5/perltypemaps.swg index 050791c56..35bb19e0b 100644 --- a/SWIG/Lib/perl5/perltypemaps.swg +++ b/SWIG/Lib/perl5/perltypemaps.swg @@ -11,11 +11,8 @@ the decl/call macros as needed. */ -#define SWIG_ASPTR_DECL_ARGS SWIG_PERL_DECL_ARGS_2 -#define SWIG_ASPTR_CALL_ARGS SWIG_PERL_CALL_ARGS_2 - -#define SWIG_ASVAL_DECL_ARGS SWIG_PERL_DECL_ARGS_2 -#define SWIG_ASVAL_CALL_ARGS SWIG_PERL_CALL_ARGS_2 +#define SWIG_AS_DECL_ARGS SWIG_PERL_DECL_ARGS_2 +#define SWIG_AS_CALL_ARGS SWIG_PERL_CALL_ARGS_2 #define SWIG_FROM_DECL_ARGS SWIG_PERL_DECL_ARGS_1 #define SWIG_FROM_CALL_ARGS SWIG_PERL_CALL_ARGS_1 diff --git a/SWIG/Lib/tcl/tcltypemaps.swg b/SWIG/Lib/tcl/tcltypemaps.swg index 94dac5b4b..bb19ac535 100644 --- a/SWIG/Lib/tcl/tcltypemaps.swg +++ b/SWIG/Lib/tcl/tcltypemaps.swg @@ -11,11 +11,8 @@ macros as needed. */ -#define SWIG_ASPTR_DECL_ARGS SWIG_TCL_DECL_ARGS_2 -#define SWIG_ASPTR_CALL_ARGS SWIG_TCL_CALL_ARGS_2 - -#define SWIG_ASVAL_DECL_ARGS SWIG_TCL_DECL_ARGS_2 -#define SWIG_ASVAL_CALL_ARGS SWIG_TCL_CALL_ARGS_2 +#define SWIG_AS_DECL_ARGS SWIG_TCL_DECL_ARGS_2 +#define SWIG_AS_CALL_ARGS SWIG_TCL_CALL_ARGS_2 /* Include fundamental fragemt definitions */ diff --git a/SWIG/Lib/typemaps/fragments.swg b/SWIG/Lib/typemaps/fragments.swg index 51894f41e..54202deba 100644 --- a/SWIG/Lib/typemaps/fragments.swg +++ b/SWIG/Lib/typemaps/fragments.swg @@ -280,24 +280,16 @@ * Define the basic macros to 'normalize' the type fragments * ----------------------------------------------------------------------------- */ -#ifndef SWIG_ASVAL_DECL_ARGS -#define SWIG_ASVAL_DECL_ARGS -#endif - -#ifndef SWIG_ASPTR_DECL_ARGS -#define SWIG_ASPTR_DECL_ARGS +#ifndef SWIG_AS_DECL_ARGS +#define SWIG_AS_DECL_ARGS #endif #ifndef SWIG_FROM_DECL_ARGS #define SWIG_FROM_DECL_ARGS #endif -#ifndef SWIG_ASVAL_CALL_ARGS -#define SWIG_ASVAL_CALL_ARGS -#endif - -#ifndef SWIG_ASPTR_CALL_ARGS -#define SWIG_ASPTR_CALL_ARGS +#ifndef SWIG_AS_CALL_ARGS +#define SWIG_AS_CALL_ARGS #endif #ifndef SWIG_FROM_CALL_ARGS @@ -311,12 +303,12 @@ #define SWIG_AsVal_frag(Type...) %fragment_name(AsVal, Type) #define SWIG_From_frag(Type...) %fragment_name(From, Type) -#define SWIG_AsVal_dec(Type...) %symbol_name(AsVal, Type) SWIG_ASVAL_DECL_ARGS -#define SWIG_AsPtr_dec(Type...) %symbol_name(AsPtr, Type) SWIG_ASPTR_DECL_ARGS +#define SWIG_AsVal_dec(Type...) %symbol_name(AsVal, Type) SWIG_AS_DECL_ARGS +#define SWIG_AsPtr_dec(Type...) %symbol_name(AsPtr, Type) SWIG_AS_DECL_ARGS #define SWIG_From_dec(Type...) %symbol_name(From, Type) SWIG_FROM_DECL_ARGS -#define SWIG_AsVal(Type...) %symbol_name(AsVal, Type) SWIG_ASVAL_CALL_ARGS -#define SWIG_AsPtr(Type...) %symbol_name(AsPtr, Type) SWIG_ASPTR_CALL_ARGS +#define SWIG_AsVal(Type...) %symbol_name(AsVal, Type) SWIG_AS_CALL_ARGS +#define SWIG_AsPtr(Type...) %symbol_name(AsPtr, Type) SWIG_AS_CALL_ARGS #define SWIG_From(Type...) %symbol_name(From, Type) SWIG_FROM_CALL_ARGS /* ------------------------------------------------------------