summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2011-06-13 16:25:37 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2011-06-13 16:25:37 -0400
commita3d290094b7dddd911ea860606c742b4b5b3a27d (patch)
tree7ae43aec044cca56a82ba3df145693d832e5cd66
parentaaaaee65c394254a07349fd5ae0899dbaa80edcf (diff)
downloadglibmm-a3d290094b7dddd911ea860606c742b4b5b3a27d.tar.gz
m4 Macros: _INITIALZE: Modify so that $1 substitutes C++ type w/o &.
* tools/m4/convert_base.m4 (_INITIALIZE): Changed the macro so that $1 substitutes the C++ type without the final ampersand (&) for convenience.
-rw-r--r--ChangeLog8
-rw-r--r--tools/m4/convert_base.m42
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 782f12a9..92759d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-13 José Alburquerque <jaalburqu@svn.gnome.org>
+
+ m4 Macros: _INITIALZE: Modify so that $1 substitutes C++ type w/o &.
+
+ * tools/m4/convert_base.m4 (_INITIALIZE): Changed the macro so that $1
+ substitutes the C++ type without the final ampersand (&) for
+ convenience.
+
2011-06-12 José Alburquerque <jaalburqu@svn.gnome.org>
gmmproc: Use '.' instead of '-' in parameter reordering.
diff --git a/tools/m4/convert_base.m4 b/tools/m4/convert_base.m4
index 81d87857..06963c19 100644
--- a/tools/m4/convert_base.m4
+++ b/tools/m4/convert_base.m4
@@ -41,7 +41,7 @@ m4_ifelse(`$3',,,`define(CF`'__HASH2(`$1',`$2'),`$3')')
define(`_INITIALIZE',`dnl
m4_ifelse(`$1',void,`$4',`dnl
pushdef(`__INI',`IN`'__HASH2(`$1',`$2')')dnl
-m4_ifdef(__INI,`m4_indir(__INI,`$1',`$2',`$3', `$4')',`
+m4_ifdef(__INI,`m4_indir(__INI,m4_substr(`$1',`0',m4_decr(m4_len(`$1'))),`$2',`$3', `$4')',`
m4_errprint(`No initialization for type $1 from type $2 defined (line: $5, output param: $3, c return: $4)
')
m4_m4exit(1)