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/wrap.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/wrap.cc')
| -rw-r--r-- | glib/glibmm/wrap.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/glibmm/wrap.cc b/glib/glibmm/wrap.cc index 4d9c71cf..4b801a46 100644 --- a/glib/glibmm/wrap.cc +++ b/glib/glibmm/wrap.cc @@ -38,7 +38,7 @@ namespace typedef std::vector<Glib::WrapNewFunction> WrapFuncTable; -static WrapFuncTable* wrap_func_table = 0; +static WrapFuncTable* wrap_func_table = nullptr; } // anonymous namespace @@ -70,7 +70,7 @@ void wrap_register_cleanup() if(wrap_func_table) { delete wrap_func_table; - wrap_func_table = 0; + wrap_func_table = nullptr; } } @@ -95,7 +95,7 @@ void wrap_register(GType type, WrapNewFunction func) static Glib::ObjectBase* wrap_create_new_wrapper(GObject* object) { - g_return_val_if_fail(wrap_func_table != 0, 0); + g_return_val_if_fail(wrap_func_table != nullptr, 0); const bool gtkmm_wrapper_already_deleted = (bool)g_object_get_qdata((GObject*)object, Glib::quark_cpp_wrapper_deleted_); if(gtkmm_wrapper_already_deleted) @@ -140,7 +140,7 @@ static gboolean gtype_wraps_interface(GType implementer_type, GType interface_ty Glib::ObjectBase* wrap_create_new_wrapper_for_interface(GObject* object, GType interface_gtype) { - g_return_val_if_fail(wrap_func_table != 0, 0); + g_return_val_if_fail(wrap_func_table != nullptr, 0); const bool gtkmm_wrapper_already_deleted = (bool)g_object_get_qdata((GObject*)object, Glib::quark_cpp_wrapper_deleted_); if(gtkmm_wrapper_already_deleted) |