summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-11-23 12:43:57 +0100
committerMurray Cumming <murrayc@murrayc.com>2011-11-23 12:43:57 +0100
commitd7e3bb63fa8841cf1cd06befab3a7a769adff46a (patch)
tree0d16e14a77b866b40f6f2fbafbfc90346dc111e4
parent926909ed02a27173dda0a608a85c3200df6d864e (diff)
downloadglibmm-d7e3bb63fa8841cf1cd06befab3a7a769adff46a.tar.gz
Avoid a deprecation warning in implelementation of deprecated API.
* glib/glibmm/main.cc: Define GLIB_DISABLE_DEPRECATION_WARNINGS to avoid a warning about g_source_get_current_time(), which we must use in our own deprecated code.
-rw-r--r--ChangeLog8
-rw-r--r--glib/glibmm/main.cc1
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bfbcf446..e5d08848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2011-11-23 Murray Cumming <murrayc@murrayc.com>
+ Avoid a deprecation warning in implelementation of deprecated API.
+
+ * glib/glibmm/main.cc: Define GLIB_DISABLE_DEPRECATION_WARNINGS
+ to avoid a warning about g_source_get_current_time(),
+ which we must use in our own deprecated code.
+
+2011-11-23 Murray Cumming <murrayc@murrayc.com>
+
class.cc: Avoid compiler warnings when using -std=c++0x with g++.
* glib/glibmm/class.cc: Add casts because GTypeQuery::class_size
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index a675ee6d..8bb4500f 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -21,6 +21,7 @@
#include <glibmm/thread.h>
#undef G_DISABLE_DEPRECATED //So we can use newly-deprecated API, to preserve our API.
+#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
#include <glibmm/main.h>
#include <glibmm/exceptionhandler.h>