From: <gg...@us...> - 2007-04-29 20:50:11
|
Revision: 9711 http://swig.svn.sourceforge.net/swig/?rev=9711&view=rev Author: gga73 Date: 2007-04-29 13:50:08 -0700 (Sun, 29 Apr 2007) Log Message: ----------- Added two #ifdef guards to allow replacing some of the exception error macros. Modified Paths: -------------- trunk/Lib/typemaps/exception.swg Modified: trunk/Lib/typemaps/exception.swg =================================================================== --- trunk/Lib/typemaps/exception.swg 2007-04-29 20:49:19 UTC (rev 9710) +++ trunk/Lib/typemaps/exception.swg 2007-04-29 20:50:08 UTC (rev 9711) @@ -13,9 +13,13 @@ /* macros for error manipulation */ #define %nullref_fmt() "invalid null reference " #define %varfail_fmt(_type,_name) "in variable '"`_name`"' of type '"`_type`"'" +#ifndef %argfail_fmt #define %argfail_fmt(_type,_name,_argn) "in method '" `_name` "', argument " `_argn`" of type '" `_type`"'" -#define %outfail_fmt(_type) "in output value of type '"_type"'" -#define %argnullref_fmt(_type,_name,_argn) %nullref_fmt() %argfail_fmt(_type, _name, _argn) +#endif +#define %outfail_fmt(_type) "in output value of type '"_type"'" +#ifndef %argnullref_fmt +#define %argnullref_fmt(_type,_name,_argn) %nullref_fmt() %argfail_fmt(_type, _name, _argn) +#endif #define %varnullref_fmt(_type,_name) %nullref_fmt() %varfail_fmt(_type, _name) #define %outnullref_fmt(_type) %nullref_fmt() %outfail_fmt(_type) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |