From 8828019282ad7b5d06e38f9c86f13bbab8f06d13 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 7 Sep 2020 00:02:44 -0700 Subject: [PATCH] Imported Upstream version 2.46.1 --- NEWS | 6 ++++++ configure.ac | 2 +- tools/m4/class_gobject.m4 | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 16bb1a0..3d8beb5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +2.46.1 (stable): + +* gmmmproc: _CLASS_GOBJECT(): + Move the "= delete"ed constructor and operator= to public, instead of private. + (Murray Cumming) + 2.46.0 (stable): Glib:: diff --git a/configure.ac b/configure.ac index 386471d..e8dd8ce 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU Lesser General Public License ## along with this library. If not, see . -AC_INIT([glibmm], [2.46.0], +AC_INIT([glibmm], [2.46.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm], [glibmm], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) diff --git a/tools/m4/class_gobject.m4 b/tools/m4/class_gobject.m4 index 793f7d7..7eb7345 100644 --- a/tools/m4/class_gobject.m4 +++ b/tools/m4/class_gobject.m4 @@ -254,16 +254,16 @@ public: typedef __CNAME__ BaseObjectType; typedef __REAL_CNAME__`'Class BaseClassType; + // noncopyable + __CPPNAME__`'(const __CPPNAME__&) = delete; + __CPPNAME__& operator=(const __CPPNAME__&) = delete; + m4_ifdef(`__BOOL_PROTECTED_GCLASS__', `protected:',`dnl else private:')dnl endif friend class __CPPNAME__`'_Class; static CppClassType `'__BASE__`'_class_; - // noncopyable - __CPPNAME__`'(const __CPPNAME__&) = delete; - __CPPNAME__& operator=(const __CPPNAME__&) = delete; - protected: explicit __CPPNAME__`'(const Glib::ConstructParams& construct_params); explicit __CPPNAME__`'(__CNAME__* castitem); -- 2.7.4