| From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 |
| From: Kjell Ahlstedt <kjellahlstedt@gmail.com> |
| Date: Wed, 20 Dec 2017 20:00:32 +0100 |
| Subject: [PATCH] Glib::Threads::Private: Fix gobj() |
| |
| Bug 791711 |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] |
| glib/glibmm/threads.h | 2 +- |
| glib/src/threads.hg | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h |
| index f7e2b82a..2c0cbe8c 100644 |
| --- a/glib/glibmm/threads.h |
| +++ b/glib/glibmm/threads.h |
| @@ -657,7 +657,7 @@ public: |
| */ |
| inline void replace(T* data); |
| |
| - GPrivate* gobj() { return gobject_; } |
| + GPrivate* gobj() { return &gobject_; } |
| |
| private: |
| GPrivate gobject_; |
| diff --git a/glib/src/threads.hg b/glib/src/threads.hg |
| index 86d7a17b..c82a6130 100644 |
| --- a/glib/src/threads.hg |
| +++ b/glib/src/threads.hg |
| @@ -628,7 +628,7 @@ public: |
| */ |
| inline void replace(T* data); |
| |
| - GPrivate* gobj() { return gobject_; } |
| + GPrivate* gobj() { return &gobject_; } |
| |
| private: |
| GPrivate gobject_; |