summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schmid <johannes.schmid@openismus.com>2007-04-30 13:15:00 +0000
committerJohannes Schmid <jhs@src.gnome.org>2007-04-30 13:15:00 +0000
commit3babccf406c8e60285f56793518479593bd1e2a1 (patch)
tree2a62c58fa0768f965f0a7659cc29161762171a0b
parentb5254be9aa67312dce1979d272b384a9975d0f4d (diff)
downloadglibmm-3babccf406c8e60285f56793518479593bd1e2a1.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=/trunk/; revision=404
-rw-r--r--ChangeLog10
-rw-r--r--tools/generate_wrap_init.pl.in2
-rw-r--r--tools/m4/class_gtkobject.m42
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index df22239b..6fbf7081 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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')