diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2006-05-18 17:08:39 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2006-05-18 17:08:39 +0000 |
| commit | 9ed16fbdd8c03dafed32babb6e41f876e2fb19fc (patch) | |
| tree | e3bbf76397b152a957a4941204f5df08914f653e | |
| parent | c47ebfb20aeb5165388101a208f26de98aea21a7 (diff) | |
| download | glibmm-9ed16fbdd8c03dafed32babb6e41f876e2fb19fc.tar.gz | |
_METHOD(): When using errthrow, actually print the function call even if
2006-05-18 Murray Cumming <murrayc@murrayc.com>
* tools/m4/method.m4: _METHOD(): When using errthrow, actually print the function call even if
the return type is 0.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/m4/method.m4 | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-05-18 Murray Cumming <murrayc@murrayc.com> + + * tools/m4/method.m4: _METHOD(): When using errthrow, actually print the function call even if + the return type is 0. + 2006-05-16 Murray Cumming <murrayc@murrayc.com> * tools/m4/method.m4: _METHOD(), _STATIC_METHOD(): Remove spaces before dnl statements, diff --git a/tools/m4/method.m4 b/tools/m4/method.m4 index 5dc96e19..1c99b93d 100644 --- a/tools/m4/method.m4 +++ b/tools/m4/method.m4 @@ -24,13 +24,13 @@ $3 __CPPNAME__::$1`'(`'$5`'ifelse(($5),(),`',`, ')std::auto_ptr<Glib::Error>& er ')dnl { ifelse(`$11',,dnl -` ifelse(`$8'`$9',,dnl If it is not errthrow or refreturn +`ifelse(`$8'`$9',,dnl If it is not errthrow or refreturn `ifelse(`$3',void,dnl If it returns voids: `$2(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6);' dnl It it returns non-void: -,`return _CONVERT($4,$3,`$2`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6)');')'dnl End if it returns voids. +,` return _CONVERT($4,$3,`$2`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6)');')'dnl End if it returns voids. ,dnl If is errthrow or refreturn `ifelse(`$9',,,` GError* gerror = 0;') - ifelse(`$3',void,,``$3' retvalue = _CONVERT($4,$3,`$2`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6)');')dnl + ifelse(`$3',void,,``$3' retvalue = ')_CONVERT($4,$3,`$2`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6)');dnl ifelse(`$9',,,` #ifdef GLIBMM_EXCEPTIONS_ENABLED if(gerror) @@ -69,7 +69,7 @@ $3 __CPPNAME__::$1(`'$5`'ifelse(($5),(),`',`, ')std::auto_ptr<Glib::Error>& erro ')dnl { ifelse(`$7'`$8',,dnl -` ifelse(`$3',void,,`return ')_CONVERT($4,$3,`$2`'($6)'); +`ifelse(`$3',void,,` return ')_CONVERT($4,$3,`$2`'($6)'); ',dnl `ifelse(`$8',,,` GError* gerror = 0;') ifelse(`$3',void,,``$3' retvalue = ')_CONVERT($4,$3,`$2`'($6)'); |