diff options
Diffstat (limited to 'glib/glibmm/objectbase.cc')
| -rw-r--r-- | glib/glibmm/objectbase.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/glib/glibmm/objectbase.cc b/glib/glibmm/objectbase.cc index 140816a4..c1efb135 100644 --- a/glib/glibmm/objectbase.cc +++ b/glib/glibmm/objectbase.cc @@ -1,6 +1,3 @@ -// -*- c++ -*- -/* $Id$ */ - /* Copyright 2002 The gtkmm Development Team * * This library is free software; you can redistribute it and/or @@ -46,7 +43,7 @@ namespace Glib // static data members ObjectBase::extra_object_base_data_type ObjectBase::extra_object_base_data; -std::auto_ptr<Threads::Mutex> ObjectBase::extra_object_base_data_mutex(new Threads::Mutex()); +Threads::Mutex* ObjectBase::extra_object_base_data_mutex = new Threads::Mutex(); ObjectBase::ObjectBase() : @@ -122,7 +119,7 @@ ObjectBase::~ObjectBase() g_warning("(Glib::ObjectBase::~ObjectBase): gobject_ = %p", (void*) gobject_); #endif - gobject_ = 0; + gobject_ = nullptr; #ifdef GLIBMM_DEBUG_REFCOUNTING g_warning("(Glib::ObjectBase::~ObjectBase): before g_object_steal_qdata()"); @@ -225,7 +222,7 @@ void ObjectBase::destroy_notify_() g_warning("Glib::ObjectBase::destroy_notify_: gobject_ = %p", (void*) gobject_); #endif - gobject_ = 0; // Make sure we don't unref it again in the dtor. + gobject_ = nullptr; // Make sure we don't unref it again in the dtor. delete this; } @@ -239,7 +236,7 @@ bool ObjectBase::is_anonymous_custom_() const bool ObjectBase::is_derived_() const { // gtkmmproc-generated classes initialize this to 0 by default. - return (custom_type_name_ != 0); + return (custom_type_name_ != nullptr); } void ObjectBase::set_manage() |