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.h | |
| parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
| parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
| download | glibmm-gir-gmmproc.tar.gz | |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/glibmm/object.h')
| -rw-r--r-- | glib/glibmm/object.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h index 4ac56a11..202b28e5 100644 --- a/glib/glibmm/object.h +++ b/glib/glibmm/object.h @@ -103,6 +103,10 @@ public: typedef GObjectClass BaseClassType; #endif /* DOXYGEN_SHOULD_SKIP_THIS */ + // noncopyable + Object(const Object&) = delete; + Object& operator=(const Object&) = delete; + protected: Object(); //For use by C++-only sub-types. explicit Object(const Glib::ConstructParams& construct_params); @@ -145,10 +149,6 @@ private: friend class Glib::Object_Class; static CppClassType object_class_; - // noncopyable - Object(const Object&); - Object& operator=(const Object&); - #endif /* DOXYGEN_SHOULD_SKIP_THIS */ // Glib::Object can not be dynamic because it lacks a float state. |