diff options
Diffstat (limited to 'tools/m4/method.m4')
| -rw-r--r-- | tools/m4/method.m4 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/m4/method.m4 b/tools/m4/method.m4 index 4193e04b..51fb97c1 100644 --- a/tools/m4/method.m4 +++ b/tools/m4/method.m4 @@ -13,13 +13,15 @@ dnl $1 $2 $3 $4 $5 $6 $7 $8 $9 $1 dnl _METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,const,refreturn,errthrow,deprecated,constversion,arglist_without_types) define(`_METHOD',`dnl _PUSH(SECTION_CC) -ifelse(`$10',,,`_DEPRECATE_IFDEF_START') -ifelse(`$9',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED') +ifelse(`$10',,,`_DEPRECATE_IFDEF_START +') dnl +ifelse(`$9',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED' +) dnl $3 __CPPNAME__::$1`'($5)ifelse(`$7',1,` const') ifelse(`$9',,,`#else $3 __CPPNAME__::$1`'(`'$5`'ifelse(($5),(),`',`, ')std::auto_ptr<Glib::Error>& error)ifelse(`$7',1,` const') #endif //GLIBMM_EXCEPTIONS_ENABLED -') +') dnl { ifelse(`$11',,dnl ` ifelse(`$8'`$9',,dnl If it is not errthrow or refreturn @@ -56,13 +58,15 @@ dnl $1 $2 $3 $4 $5 $6 $7 $ dnl _STATIC_METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,refreturn,errthrow,deprecated)) define(`_STATIC_METHOD',`dnl _PUSH(SECTION_CC) -ifelse(`$9',,,`_DEPRECATE_IFDEF_START') dnl -ifelse(`$8',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED') +ifelse(`$9',,,`_DEPRECATE_IFDEF_START +') dnl +ifelse(`$8',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED +') dnl $3 __CPPNAME__::$1($5) ifelse(`$8',,,`#else $3 __CPPNAME__::$1(`'$5`'ifelse(($5),(),`',`, ')std::auto_ptr<Glib::Error>& error) #endif //GLIBMM_EXCEPTIONS_ENABLED -') +') dnl { ifelse(`$7'`$8',,dnl ` ifelse(`$3',void,,`return ')_CONVERT($4,$3,`$2`'($6)'); |