diff options
| author | Johannes Schmid <johannes.schmid@openismus.com> | 2007-04-30 13:15:29 +0000 |
|---|---|---|
| committer | Johannes Schmid <jhs@src.gnome.org> | 2007-04-30 13:15:29 +0000 |
| commit | 8b9643ea3fe8d674a4555373ad88bbbfa0080cb0 (patch) | |
| tree | ab3e90659761372c46d38a03f1a49bcfb7659b8f | |
| parent | 950b49a8580c4471f1a1bddd29fc81724db62b4d (diff) | |
| download | glibmm-8b9643ea3fe8d674a4555373ad88bbbfa0080cb0.tar.gz | |
Use _IS_DEPRECATED instead of _CLASS_DEPRECATED because the latter
2007-04-30 Johannes Schmid <johannes.schmid@openismus.com>
* tools/generate_wrap_init.pl.in:
* tools/m4/class_gtkobject.m4:
Use _IS_DEPRECATED instead of _CLASS_DEPRECATED because
the latter confuses gmmproc.
We cannot just use _DEPRECATED because it will result
in incorrect handling of for example
#ifndef GTKMM_DISABLE_DEPRECATED
svn path=/branches/glibmm-2-12/; revision=405
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | tools/generate_wrap_init.pl.in | 2 | ||||
| -rw-r--r-- | tools/m4/class_gtkobject.m4 | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2007-04-30 Johannes Schmid <johannes.schmid@openismus.com> + + * tools/generate_wrap_init.pl.in: + * tools/m4/class_gtkobject.m4: + Use _IS_DEPRECATED instead of _CLASS_DEPRECATED because + the latter confuses gmmproc. + We cannot just use _DEPRECATED because it will result + in incorrect handling of for example + #ifndef GTKMM_DISABLE_DEPRECATED + 2007-04-24 Yselkowitz <yselkowitz@users.sourceforge.net> * scripts/macros.m4: Check for both m4 and M4 in the GNU m4 output, diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in index 8d9a7621..57a9cff5 100644 --- a/tools/generate_wrap_init.pl.in +++ b/tools/generate_wrap_init.pl.in @@ -133,7 +133,7 @@ while ($ARGV[0]) { $win32_nowrap{$cppname} = 1; } - elsif (/_CLASS_DEPRECATED/) + elsif (/_IS_DEPRECATED/) { $deprecated{$cppname} = 1; } diff --git a/tools/m4/class_gtkobject.m4 b/tools/m4/class_gtkobject.m4 index ab1ea079..9446f392 100644 --- a/tools/m4/class_gtkobject.m4 +++ b/tools/m4/class_gtkobject.m4 @@ -55,7 +55,7 @@ _POP() ') dnl Optionally ifdef-out the whole .h and .cc files: -define(`_DEPRECATED',`dnl +define(`_IS_DEPRECATED',`dnl _PUSH() dnl Define this macro to be tested for later. define(`__BOOL_DEPRECATED__',`$1') |