diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/glibmm/object.cc | |
parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
download | glibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/glibmm/object.cc')
-rw-r--r-- | glib/glibmm/object.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/glibmm/object.cc b/glib/glibmm/object.cc index 1658d81c..ddaa47b1 100644 --- a/glib/glibmm/object.cc +++ b/glib/glibmm/object.cc @@ -84,10 +84,10 @@ ConstructParams::ConstructParams(const Glib::Class& glibmm_class_, static_cast<GObjectClass*>(g_type_class_ref(glibmm_class.get_type())); unsigned int n_alloced_params = 0; - char* collect_error = 0; // output argument of G_VALUE_COLLECT() + char* collect_error = nullptr; // output argument of G_VALUE_COLLECT() for(const char* name = first_property_name; - name != 0; + name != nullptr; name = va_arg(var_args, char*)) { GParamSpec *const pspec = g_object_class_find_property(g_class, name); |