diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-02-28 15:58:01 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-02-28 15:58:01 +0100 |
| commit | 423e6fbb104bb08ab876f1642b043de996467f0b (patch) | |
| tree | 039ae8c6e35fc5b217cb223bd8d583a933b5479c /tools/m4/class_shared.m4 | |
| parent | ea9678603eb8a0284885a54e8c2e7d306b2ef4b2 (diff) | |
| download | glibmm-423e6fbb104bb08ab876f1642b043de996467f0b.tar.gz | |
Fix the build with --disable-deprecated-api.
* glib/glibmm/main.cc: Call get_time() instead of the deprecated
get_current_time(), when GLIBMM_DISABLE_DEPRECATED is defined.
* glib/src/thread.[hg|ccg]: Use _IS_DEPRECATED instead of
_DEPRECATE_IFDEF_{START|END}. _DEPRECATE_IFDEF_{START|END} does not include
code generated by gmmproc within #ifndef/#endif.
* glib/src/threads.ccg: Change catch(Glib::Thread::Exit&) to
catch(Glib::Threads::Thread::Exit&).
* glib/src/threads.hg: Add _GMMPROC_EXTRA_NAMESPACE(Threads).
* glib/src/valuearray.hg:
* gio/src/application.hg: #undef G_DISABLE_DEPRECATED in the .cc file.
* tools/m4/class_shared.m4: Define _IS_DEPRECATED. Bug #640029.
Diffstat (limited to 'tools/m4/class_shared.m4')
| -rw-r--r-- | tools/m4/class_shared.m4 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/m4/class_shared.m4 b/tools/m4/class_shared.m4 index b1af688f..f807de6d 100644 --- a/tools/m4/class_shared.m4 +++ b/tools/m4/class_shared.m4 @@ -266,4 +266,13 @@ define(`_GTKMMPROC_WIN32_NO_WRAP', dnl //and the class will not be registered in wrap_init.h or wrap_init.cc ')dnl +dnl _IS_DEPRECATED +dnl ifdef-out the whole .h and .cc files. +dnl generate_wrap_init.pl will look for this in the original .hg file. +define(`_IS_DEPRECATED',`dnl +_PUSH() +dnl Define this macro to be tested for later. See base.m4. +define(`__BOOL_DEPRECATED__',`$1') +_POP() +') |