unity-scopes-api

Merge lp:~jpakkane/unity-scopes-api/thefinalpeel into lp:unity-scopes-api

  1. thefinalpeel
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 128
Merged at revision: 129
Proposed branch: lp:~jpakkane/unity-scopes-api/thefinalpeel
Merge into: lp:unity-scopes-api
Diff against target: 165 lines (+19/-15)
8 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-2)
demo/scopes/scope-A/scope-A.cpp (+2/-2)
demo/scopes/scope-B/scope-B.cpp (+2/-2)
demo/scopes/scope-C/scope-C.cpp (+2/-2)
demo/scopes/scope-D/scope-D.cpp (+2/-2)
demo/scopes/scope-N/scope-N.cpp (+2/-2)
demo/scopes/scope-S/scope-S.cpp (+2/-2)
To merge this branch: bzr merge lp:~jpakkane/unity-scopes-api/thefinalpeel
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+201357@code.launchpad.net

Commit message

Use the correct macro.

Description of the change

Use the correct macro.

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-amd64-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-i386-ci/217/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/217/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-autolanding/92/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3849/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-amd64-autolanding/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-autolanding/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-i386-autolanding/92/console

review: Needs Fixing (continuous-integration)
lp:~jpakkane/unity-scopes-api/thefinalpeel updated
127. By Jussi Pakkanen

Merged trunk.

128. By Jussi Pakkanen

Version bump.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-amd64-ci/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/221
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-armhf-ci/221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-trusty-i386-ci/221

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/221/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-01-10 11:04:29 +0000
+++ CMakeLists.txt 2014-01-13 14:22:07 +0000
@@ -174,7 +174,7 @@
174# API version174# API version
175set(UNITY_SCOPES_MAJOR 0)175set(UNITY_SCOPES_MAJOR 0)
176set(UNITY_SCOPES_MINOR 1)176set(UNITY_SCOPES_MINOR 1)
177set(UNITY_SCOPES_MICRO 7)177set(UNITY_SCOPES_MICRO 8)
178178
179# Scopes library179# Scopes library
180set(UNITY_SCOPES_LIB unity-scopes)180set(UNITY_SCOPES_LIB unity-scopes)
181181
=== modified file 'debian/changelog'
--- debian/changelog 2014-01-02 21:33:05 +0000
+++ debian/changelog 2014-01-13 14:22:07 +0000
@@ -1,10 +1,14 @@
1unity-scopes-api (0.1.7-0ubuntu1) UNRELEASED; urgency=low1unity-scopes-api (0.1.8-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Michi Henning ]
3 * Added ability for scope to push an exception (as an exception_ptr). On the client side,4 * Added ability for scope to push an exception (as an exception_ptr). On the client side,
4 the exception is delivered as the what() string (if the exception is a std::exception) and5 the exception is delivered as the what() string (if the exception is a std::exception) and
5 as "unknown exception", otherwise.6 as "unknown exception", otherwise.
67
7 -- Michi Henning <michi.henning@canonical.com> Fri, 03 Jan 2014 07:31:02 +10008 [ Jussi Pakkanen ]
9 * Version bump due to namespace peeling.
10
11 -- Jussi Pakkanen <jussi.pakkanen@ubuntu.com> Mon, 13 Jan 2014 16:18:59 +0200
812
9unity-scopes-api (0.1.6+14.04.20131219.1-0ubuntu1) trusty; urgency=low13unity-scopes-api (0.1.6+14.04.20131219.1-0ubuntu1) trusty; urgency=low
1014
1115
=== modified file 'demo/scopes/scope-A/scope-A.cpp'
--- demo/scopes/scope-A/scope-A.cpp 2014-01-07 12:22:29 +0000
+++ demo/scopes/scope-A/scope-A.cpp 2014-01-13 14:22:07 +0000
@@ -96,7 +96,7 @@
96 EXPORT96 EXPORT
97 unity::scopes::ScopeBase*97 unity::scopes::ScopeBase*
98 // cppcheck-suppress unusedFunction98 // cppcheck-suppress unusedFunction
99 UNITY_API_SCOPE_CREATE_FUNCTION()99 UNITY_SCOPE_CREATE_FUNCTION()
100 {100 {
101 return new MyScope;101 return new MyScope;
102 }102 }
@@ -104,7 +104,7 @@
104 EXPORT104 EXPORT
105 void105 void
106 // cppcheck-suppress unusedFunction106 // cppcheck-suppress unusedFunction
107 UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)107 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
108 {108 {
109 delete scope_base;109 delete scope_base;
110 }110 }
111111
=== modified file 'demo/scopes/scope-B/scope-B.cpp'
--- demo/scopes/scope-B/scope-B.cpp 2014-01-07 12:22:29 +0000
+++ demo/scopes/scope-B/scope-B.cpp 2014-01-13 14:22:07 +0000
@@ -162,7 +162,7 @@
162 EXPORT162 EXPORT
163 unity::scopes::ScopeBase*163 unity::scopes::ScopeBase*
164 // cppcheck-suppress unusedFunction164 // cppcheck-suppress unusedFunction
165 UNITY_API_SCOPE_CREATE_FUNCTION()165 UNITY_SCOPE_CREATE_FUNCTION()
166 {166 {
167 return new MyScope;167 return new MyScope;
168 }168 }
@@ -170,7 +170,7 @@
170 EXPORT170 EXPORT
171 void171 void
172 // cppcheck-suppress unusedFunction172 // cppcheck-suppress unusedFunction
173 UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)173 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
174 {174 {
175 delete scope_base;175 delete scope_base;
176 }176 }
177177
=== modified file 'demo/scopes/scope-C/scope-C.cpp'
--- demo/scopes/scope-C/scope-C.cpp 2014-01-07 12:22:29 +0000
+++ demo/scopes/scope-C/scope-C.cpp 2014-01-13 14:22:07 +0000
@@ -224,7 +224,7 @@
224 EXPORT224 EXPORT
225 unity::scopes::ScopeBase*225 unity::scopes::ScopeBase*
226 // cppcheck-suppress unusedFunction226 // cppcheck-suppress unusedFunction
227 UNITY_API_SCOPE_CREATE_FUNCTION()227 UNITY_SCOPE_CREATE_FUNCTION()
228 {228 {
229 return new MyScope;229 return new MyScope;
230 }230 }
@@ -232,7 +232,7 @@
232 EXPORT232 EXPORT
233 void233 void
234 // cppcheck-suppress unusedFunction234 // cppcheck-suppress unusedFunction
235 UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)235 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
236 {236 {
237 delete scope_base;237 delete scope_base;
238 }238 }
239239
=== modified file 'demo/scopes/scope-D/scope-D.cpp'
--- demo/scopes/scope-D/scope-D.cpp 2014-01-07 12:22:29 +0000
+++ demo/scopes/scope-D/scope-D.cpp 2014-01-13 14:22:07 +0000
@@ -248,7 +248,7 @@
248 EXPORT248 EXPORT
249 unity::scopes::ScopeBase*249 unity::scopes::ScopeBase*
250 // cppcheck-suppress unusedFunction250 // cppcheck-suppress unusedFunction
251 UNITY_API_SCOPE_CREATE_FUNCTION()251 UNITY_SCOPE_CREATE_FUNCTION()
252 {252 {
253 return new MyScope;253 return new MyScope;
254 }254 }
@@ -256,7 +256,7 @@
256 EXPORT256 EXPORT
257 void257 void
258 // cppcheck-suppress unusedFunction258 // cppcheck-suppress unusedFunction
259 UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)259 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
260 {260 {
261 delete scope_base;261 delete scope_base;
262 }262 }
263263
=== modified file 'demo/scopes/scope-N/scope-N.cpp'
--- demo/scopes/scope-N/scope-N.cpp 2014-01-07 12:22:29 +0000
+++ demo/scopes/scope-N/scope-N.cpp 2014-01-13 14:22:07 +0000
@@ -75,7 +75,7 @@
75 EXPORT75 EXPORT
76 unity::scopes::ScopeBase*76 unity::scopes::ScopeBase*
77 // cppcheck-suppress unusedFunction77 // cppcheck-suppress unusedFunction
78 UNITY_API_SCOPE_CREATE_FUNCTION()78 UNITY_SCOPE_CREATE_FUNCTION()
79 {79 {
80 return new MyScope;80 return new MyScope;
81 }81 }
@@ -83,7 +83,7 @@
83 EXPORT83 EXPORT
84 void84 void
85 // cppcheck-suppress unusedFunction85 // cppcheck-suppress unusedFunction
86 UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)86 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
87 {87 {
88 delete scope_base;88 delete scope_base;
89 }89 }
9090
=== modified file 'demo/scopes/scope-S/scope-S.cpp'
--- demo/scopes/scope-S/scope-S.cpp 2014-01-07 12:22:29 +0000
+++ demo/scopes/scope-S/scope-S.cpp 2014-01-13 14:22:07 +0000
@@ -108,7 +108,7 @@
108 EXPORT108 EXPORT
109 unity::scopes::ScopeBase*109 unity::scopes::ScopeBase*
110 // cppcheck-suppress unusedFunction110 // cppcheck-suppress unusedFunction
111 UNITY_API_SCOPE_CREATE_FUNCTION()111 UNITY_SCOPE_CREATE_FUNCTION()
112 {112 {
113 return new MyScope;113 return new MyScope;
114 }114 }
@@ -116,7 +116,7 @@
116 EXPORT116 EXPORT
117 void117 void
118 // cppcheck-suppress unusedFunction118 // cppcheck-suppress unusedFunction
119 UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)119 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
120 {120 {
121 delete scope_base;121 delete scope_base;
122 }122 }

Subscribers

People subscribed via source and target branches

to all changes: