From 7d4916b9382119604de2602b0cdb6866a80330b6 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 May 2008 21:06:13 +0000 Subject: [PATCH] fix macro clash with %mangle in swigmacros.swig so that test can run in c++ mode git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10470 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/preproc.i | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Examples/test-suite/preproc.i b/Examples/test-suite/preproc.i index 164d1a1d1..9491fc1d2 100644 --- a/Examples/test-suite/preproc.i +++ b/Examples/test-suite/preproc.i @@ -228,15 +228,14 @@ This testcase tests operators for defines -#ifndef SWIGOCTAVE #ifdef __cplusplus -#define %mangle(...) #@__VA_ARGS__ -#define %mangle_str(...) ##@__VA_ARGS__ +#define %mangle_macro(...) #@__VA_ARGS__ +#define %mangle_macro_str(...) ##@__VA_ARGS__ %define my_func(...) -inline const char* mangle ## #@__VA_ARGS__ () { - return %mangle_str(__VA_ARGS__); +inline const char* mangle_macro ## #@__VA_ARGS__ () { + return %mangle_macro_str(__VA_ARGS__); } %enddef @@ -246,7 +245,6 @@ inline const char* mangle ## #@__VA_ARGS__ () { } #endif -#endif #if defined (__cplusplus) \