Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 838fe84c2ddcc9af51c34f751defbf3dd0ba8a06 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kjell Ahlstedt <kjellahlstedt@gmail.com> |
| 3 | Date: Wed, 20 Dec 2017 20:00:32 +0100 |
| 4 | Subject: [PATCH] Glib::Threads::Private: Fix gobj() |
| 5 | |
| 6 | Bug 791711 |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | Upstream-Status: Backport [https://github.com/GNOME/glibmm/commit/37d57ae9572b7d74aa385a30313eceae7f2d3fce] |
| 11 | glib/glibmm/threads.h | 2 +- |
| 12 | glib/src/threads.hg | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/glib/glibmm/threads.h b/glib/glibmm/threads.h |
| 16 | index f7e2b82a..2c0cbe8c 100644 |
| 17 | --- a/glib/glibmm/threads.h |
| 18 | +++ b/glib/glibmm/threads.h |
| 19 | @@ -657,7 +657,7 @@ public: |
| 20 | */ |
| 21 | inline void replace(T* data); |
| 22 | |
| 23 | - GPrivate* gobj() { return gobject_; } |
| 24 | + GPrivate* gobj() { return &gobject_; } |
| 25 | |
| 26 | private: |
| 27 | GPrivate gobject_; |
| 28 | diff --git a/glib/src/threads.hg b/glib/src/threads.hg |
| 29 | index 86d7a17b..c82a6130 100644 |
| 30 | --- a/glib/src/threads.hg |
| 31 | +++ b/glib/src/threads.hg |
| 32 | @@ -628,7 +628,7 @@ public: |
| 33 | */ |
| 34 | inline void replace(T* data); |
| 35 | |
| 36 | - GPrivate* gobj() { return gobject_; } |
| 37 | + GPrivate* gobj() { return &gobject_; } |
| 38 | |
| 39 | private: |
| 40 | GPrivate gobject_; |