diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2006-05-16 21:31:39 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2006-05-16 21:31:39 +0000 |
| commit | c47ebfb20aeb5165388101a208f26de98aea21a7 (patch) | |
| tree | 8c980426a03a238fb7c7b6d226fd6585b060ccfe | |
| parent | 445cb96bb82c1a42d64d1d449eedf43e253a7d13 (diff) | |
| download | glibmm-c47ebfb20aeb5165388101a208f26de98aea21a7.tar.gz | |
_METHOD(), _STATIC_METHOD(): Remove spaces before dnl statements, to avoid
2006-05-16 Murray Cumming <murrayc@murrayc.com>
* tools/m4/method.m4: _METHOD(), _STATIC_METHOD(): Remove spaces before dnl statements,
to avoid unwanted indentation in .cc files.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/m4/method.m4 | 16 |
2 files changed, 13 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2006-05-16 Murray Cumming <murrayc@murrayc.com> + * tools/m4/method.m4: _METHOD(), _STATIC_METHOD(): Remove spaces before dnl statements, + to avoid unwanted indentation in .cc files. + +2006-05-16 Murray Cumming <murrayc@murrayc.com> + * tools/m4/convert_base.m4: _CONVERT(): If the return type is void, use the unconverted statement, not no statement. This prevents some void methods from being totally empty. This was a (very bad) regression introduced by the optional API changed. diff --git a/tools/m4/method.m4 b/tools/m4/method.m4 index 51fb97c1..5dc96e19 100644 --- a/tools/m4/method.m4 +++ b/tools/m4/method.m4 @@ -14,20 +14,20 @@ dnl _METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,const,refreturn,err define(`_METHOD',`dnl _PUSH(SECTION_CC) ifelse(`$10',,,`_DEPRECATE_IFDEF_START -') dnl +')dnl ifelse(`$9',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED' -) dnl +)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 +')dnl { ifelse(`$11',,dnl ` 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 @@ -59,18 +59,18 @@ dnl _STATIC_METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,refreturn,er define(`_STATIC_METHOD',`dnl _PUSH(SECTION_CC) ifelse(`$9',,,`_DEPRECATE_IFDEF_START -') dnl +')dnl ifelse(`$8',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED -') dnl +')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 +')dnl { ifelse(`$7'`$8',,dnl ` ifelse(`$3',void,,`return ')_CONVERT($4,$3,`$2`'($6)'); -', dnl +',dnl `ifelse(`$8',,,` GError* gerror = 0;') ifelse(`$3',void,,``$3' retvalue = ')_CONVERT($4,$3,`$2`'($6)'); ifelse(`$8',,,` |