1
=== modified file 'debian/changelog'
2
--- debian/changelog	2017-02-17 14:12:04 +0000
3
+++ debian/changelog	2017-02-23 11:19:18 +0000
4
@@ -1,3 +1,11 @@
5
1
unity-api (8.4-0ubuntu1) UNRELEASED; urgency=medium
6
2
7
3
  [ Pete Woods ]
8
4
  * unity::util - Make Glib and GObject memory management
9
5
    utilities handle NULL quietly.
10
6
11
7
 -- Pete <pete.woods@canonical.com>  Tue, 21 Feb 2017 13:11:57 +0000
12
8
13
1
unity-api (8.3+17.04.20170217-0ubuntu1) zesty; urgency=medium
9
unity-api (8.3+17.04.20170217-0ubuntu1) zesty; urgency=medium
14
2
10
15
3
  [ Pete ]
11
  [ Pete ]
16
4
12
17
=== modified file 'include/unity/util/GObjectMemory.h'
18
--- include/unity/util/GObjectMemory.h	2017-01-19 13:49:43 +0000
19
+++ include/unity/util/GObjectMemory.h	2017-02-23 11:19:18 +0000
20
@@ -59,8 +59,10 @@
21
59
{
59
{
22
60
    void operator()(gpointer ptr)
60
    void operator()(gpointer ptr)
23
61
    {
61
    {
26
62
        g_return_if_fail(G_IS_OBJECT(ptr));
62
        if (G_IS_OBJECT(ptr))
27
63
        g_object_unref(ptr);
63
        {
28
64
            g_object_unref(ptr);
29
65
        }
30
64
    }
66
    }
31
65
};
67
};
32
66
68
33
67
69
34
=== modified file 'include/unity/util/GlibMemory.h'
35
--- include/unity/util/GlibMemory.h	2017-02-17 13:40:58 +0000
36
+++ include/unity/util/GlibMemory.h	2017-02-23 11:19:18 +0000
37
@@ -28,18 +28,33 @@
38
28
namespace util
28
namespace util
39
29
{
29
{
40
30
30
41
31
template<typename T, typename D>
42
32
struct GlibDeleter
43
33
{
44
34
    D _d;
45
35
46
36
    void operator()(T* ptr)
47
37
    {
48
38
        if (ptr != nullptr)
49
39
        {
50
40
            _d(ptr);
51
41
        }
52
42
    }
53
43
};
54
44
55
31
#pragma push_macro("G_DEFINE_AUTOPTR_CLEANUP_FUNC")
45
#pragma push_macro("G_DEFINE_AUTOPTR_CLEANUP_FUNC")
56
32
#undef G_DEFINE_AUTOPTR_CLEANUP_FUNC
46
#undef G_DEFINE_AUTOPTR_CLEANUP_FUNC
57
33
#define G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func) \
47
#define G_DEFINE_AUTOPTR_CLEANUP_FUNC(TypeName, func) \
58
48
typedef GlibDeleter<TypeName, decltype(&func)> TypeName##Deleter; \
59
34
typedef std::shared_ptr<TypeName> TypeName##SPtr; \
49
typedef std::shared_ptr<TypeName> TypeName##SPtr; \
60
35
inline TypeName##SPtr share_glib(TypeName* ptr) \
50
inline TypeName##SPtr share_glib(TypeName* ptr) \
61
36
{ \
51
{ \
63
37
    return TypeName##SPtr(ptr, &func); \
52
    return TypeName##SPtr(ptr, TypeName##Deleter{&func}); \
64
38
} \
53
} \
66
39
typedef std::unique_ptr<TypeName, decltype(&func)> TypeName##UPtr; \
54
typedef std::unique_ptr<TypeName, TypeName##Deleter> TypeName##UPtr; \
67
40
inline TypeName##UPtr unique_glib(TypeName* ptr) \
55
inline TypeName##UPtr unique_glib(TypeName* ptr) \
68
41
{ \
56
{ \
70
42
    return TypeName##UPtr(ptr, &func); \
57
    return TypeName##UPtr(ptr, TypeName##Deleter{&func}); \
71
43
}
58
}
72
44
59
73
45
#pragma push_macro("G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC")
60
#pragma push_macro("G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC")
74
46
61
75
=== modified file 'test/gtest/unity/util/GObjectMemory/GObjectMemory_test.cpp'
76
--- test/gtest/unity/util/GObjectMemory/GObjectMemory_test.cpp	2017-01-19 13:49:43 +0000
77
+++ test/gtest/unity/util/GObjectMemory/GObjectMemory_test.cpp	2017-02-23 11:19:18 +0000
78
@@ -174,6 +174,11 @@
79
174
class GObjectMemoryTest: public testing::Test
174
class GObjectMemoryTest: public testing::Test
80
175
{
175
{
81
176
protected:
176
protected:
82
177
    static void SetUpTestCase()
83
178
    {
84
179
        g_log_set_always_fatal((GLogLevelFlags) (G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL));
85
180
    }
86
181
87
177
    void SetUp() override
182
    void SetUp() override
88
178
    {
183
    {
89
179
        DELETED_OBJECTS.clear();
184
        DELETED_OBJECTS.clear();
90
@@ -298,6 +303,7 @@
91
298
    auto u1 = unique_gobject(o1);
303
    auto u1 = unique_gobject(o1);
92
299
    auto u2 = unique_gobject<FooBar>(nullptr);
304
    auto u2 = unique_gobject<FooBar>(nullptr);
93
300
    auto u3 = unique_gobject(o3);
305
    auto u3 = unique_gobject(o3);
94
306
    auto u4 = unique_gobject((FooBar *) NULL);
95
301
307
96
302
    EXPECT_TRUE(!u1);
308
    EXPECT_TRUE(!u1);
97
303
    EXPECT_TRUE(!u2);
309
    EXPECT_TRUE(!u2);
98
304
310
99
=== modified file 'test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp'
100
--- test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp	2017-02-17 13:40:58 +0000
101
+++ test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp	2017-02-23 11:19:18 +0000
102
@@ -37,6 +37,11 @@
103
37
class GlibMemoryTest: public testing::Test
37
class GlibMemoryTest: public testing::Test
104
38
{
38
{
105
39
protected:
39
protected:
106
40
    static void SetUpTestCase()
107
41
    {
108
42
        g_log_set_always_fatal((GLogLevelFlags) (G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL));
109
43
    }
110
44
111
40
    void SetUp() override
45
    void SetUp() override
112
41
    {
46
    {
113
42
        keys.clear();
47
        keys.clear();
114
@@ -108,6 +113,10 @@
115
108
        EXPECT_EQ(set<string>({"hello", "hash"}), keys);
113
        EXPECT_EQ(set<string>({"hello", "hash"}), keys);
116
109
        EXPECT_EQ(set<string>({"there", "world"}), values);
114
        EXPECT_EQ(set<string>({"there", "world"}), values);
117
110
    }
115
    }
118
116
119
117
    {
120
118
        auto emptyVariant = unique_glib((GVariant*) NULL);
121
119
    }
122
111
}
120
}
123
112
121
124
113
TEST_F(GlibMemoryTest, Share)
122
TEST_F(GlibMemoryTest, Share)
125
@@ -132,6 +141,10 @@
126
132
        EXPECT_EQ(set<string>({"hello", "hash"}), keys);
141
        EXPECT_EQ(set<string>({"hello", "hash"}), keys);
127
133
        EXPECT_EQ(set<string>({"there", "world"}), values);
142
        EXPECT_EQ(set<string>({"there", "world"}), values);
128
134
    }
143
    }
129
144
130
145
    {
131
146
        auto emptyVariant = share_glib((GVariant*) NULL);
132
147
    }
133
135
}
148
}
134
136
149
135
137
}
150
}
Status:	Merged
Approved by:	Pete Woods on 2017-02-23
Approved revision:	277
Merged at revision:	274
Proposed branch:	lp:~pete-woods/unity-api/handle-null-quietly
Merge into:	lp:unity-api
Diff against target:	135 lines (+49/-5) 5 files modified debian/changelog (+8/-0) include/unity/util/GObjectMemory.h (+4/-2) include/unity/util/GlibMemory.h (+18/-3) test/gtest/unity/util/GObjectMemory/GObjectMemory_test.cpp (+6/-0) test/gtest/unity/util/GlibMemory/GlibMemory_test.cpp (+13/-0)
To merge this branch:	bzr merge lp:~pete-woods/unity-api/handle-null-quietly
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-02-23
Charles Kerr (community)		2017-02-20	Approve on 2017-02-22
Review via email: mp+317803@code.launchpad.net