summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2012-03-15 12:34:35 +0100
committerMurray Cumming <murrayc@murrayc.com>2012-03-19 09:53:20 +0100
commitf4b8b84e1acfab3b275578c47f3f21da716737d6 (patch)
tree7eddc33a72de9e0218da3a109a92e7595022e24f
parent8f805264bd71dc8031dac7c9831f434c15c19a86 (diff)
downloadglibmm-f4b8b84e1acfab3b275578c47f3f21da716737d6.tar.gz
Fix some warnings found by clang++.
* glib/glibmm/class.cc: registered_derived_type(): Use (void*)0 instead of NULL to avoid a missing sentintel warning.
-rw-r--r--ChangeLog7
-rw-r--r--glib/glibmm/class.cc2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc1ecc20..115c288a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-15 Murray Cumming <murrayc@murrayc.com>
+
+ Fix some warnings found by clang++.
+
+ * glib/glibmm/class.cc: registered_derived_type(): Use (void*)0 instead
+ of NULL to avoid a missing sentintel warning.
+
2012-03-16 José Alburquerque <jaalburquerque@gmail.com>
Gio::DBus::Object: Add the signals of the interface.
diff --git a/glib/glibmm/class.cc b/glib/glibmm/class.cc
index 8aed7869..5f96ec4a 100644
--- a/glib/glibmm/class.cc
+++ b/glib/glibmm/class.cc
@@ -74,7 +74,7 @@ void Class::register_derived_type(GType base_type, GTypeModule* module)
return;
}
- gchar* derived_name = g_strconcat("gtkmm__", base_query.type_name, NULL);
+ gchar* derived_name = g_strconcat("gtkmm__", base_query.type_name, (void*)0);
if(module)
gtype_ = g_type_module_register_type(module, base_type, derived_name, &derived_info, GTypeFlags(0));