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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-01-10 11:04:29 +0000
3+++ CMakeLists.txt 2014-01-13 14:22:07 +0000
4@@ -174,7 +174,7 @@
5 # API version
6 set(UNITY_SCOPES_MAJOR 0)
7 set(UNITY_SCOPES_MINOR 1)
8-set(UNITY_SCOPES_MICRO 7)
9+set(UNITY_SCOPES_MICRO 8)
10
11 # Scopes library
12 set(UNITY_SCOPES_LIB unity-scopes)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-01-02 21:33:05 +0000
16+++ debian/changelog 2014-01-13 14:22:07 +0000
17@@ -1,10 +1,14 @@
18-unity-scopes-api (0.1.7-0ubuntu1) UNRELEASED; urgency=low
19+unity-scopes-api (0.1.8-0ubuntu1) UNRELEASED; urgency=low
20
21+ [ Michi Henning ]
22 * Added ability for scope to push an exception (as an exception_ptr). On the client side,
23 the exception is delivered as the what() string (if the exception is a std::exception) and
24 as "unknown exception", otherwise.
25
26- -- Michi Henning <michi.henning@canonical.com> Fri, 03 Jan 2014 07:31:02 +1000
27+ [ Jussi Pakkanen ]
28+ * Version bump due to namespace peeling.
29+
30+ -- Jussi Pakkanen <jussi.pakkanen@ubuntu.com> Mon, 13 Jan 2014 16:18:59 +0200
31
32 unity-scopes-api (0.1.6+14.04.20131219.1-0ubuntu1) trusty; urgency=low
33
34
35=== modified file 'demo/scopes/scope-A/scope-A.cpp'
36--- demo/scopes/scope-A/scope-A.cpp 2014-01-07 12:22:29 +0000
37+++ demo/scopes/scope-A/scope-A.cpp 2014-01-13 14:22:07 +0000
38@@ -96,7 +96,7 @@
39 EXPORT
40 unity::scopes::ScopeBase*
41 // cppcheck-suppress unusedFunction
42- UNITY_API_SCOPE_CREATE_FUNCTION()
43+ UNITY_SCOPE_CREATE_FUNCTION()
44 {
45 return new MyScope;
46 }
47@@ -104,7 +104,7 @@
48 EXPORT
49 void
50 // cppcheck-suppress unusedFunction
51- UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
52+ UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
53 {
54 delete scope_base;
55 }
56
57=== modified file 'demo/scopes/scope-B/scope-B.cpp'
58--- demo/scopes/scope-B/scope-B.cpp 2014-01-07 12:22:29 +0000
59+++ demo/scopes/scope-B/scope-B.cpp 2014-01-13 14:22:07 +0000
60@@ -162,7 +162,7 @@
61 EXPORT
62 unity::scopes::ScopeBase*
63 // cppcheck-suppress unusedFunction
64- UNITY_API_SCOPE_CREATE_FUNCTION()
65+ UNITY_SCOPE_CREATE_FUNCTION()
66 {
67 return new MyScope;
68 }
69@@ -170,7 +170,7 @@
70 EXPORT
71 void
72 // cppcheck-suppress unusedFunction
73- UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
74+ UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
75 {
76 delete scope_base;
77 }
78
79=== modified file 'demo/scopes/scope-C/scope-C.cpp'
80--- demo/scopes/scope-C/scope-C.cpp 2014-01-07 12:22:29 +0000
81+++ demo/scopes/scope-C/scope-C.cpp 2014-01-13 14:22:07 +0000
82@@ -224,7 +224,7 @@
83 EXPORT
84 unity::scopes::ScopeBase*
85 // cppcheck-suppress unusedFunction
86- UNITY_API_SCOPE_CREATE_FUNCTION()
87+ UNITY_SCOPE_CREATE_FUNCTION()
88 {
89 return new MyScope;
90 }
91@@ -232,7 +232,7 @@
92 EXPORT
93 void
94 // cppcheck-suppress unusedFunction
95- UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
96+ UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
97 {
98 delete scope_base;
99 }
100
101=== modified file 'demo/scopes/scope-D/scope-D.cpp'
102--- demo/scopes/scope-D/scope-D.cpp 2014-01-07 12:22:29 +0000
103+++ demo/scopes/scope-D/scope-D.cpp 2014-01-13 14:22:07 +0000
104@@ -248,7 +248,7 @@
105 EXPORT
106 unity::scopes::ScopeBase*
107 // cppcheck-suppress unusedFunction
108- UNITY_API_SCOPE_CREATE_FUNCTION()
109+ UNITY_SCOPE_CREATE_FUNCTION()
110 {
111 return new MyScope;
112 }
113@@ -256,7 +256,7 @@
114 EXPORT
115 void
116 // cppcheck-suppress unusedFunction
117- UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
118+ UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
119 {
120 delete scope_base;
121 }
122
123=== modified file 'demo/scopes/scope-N/scope-N.cpp'
124--- demo/scopes/scope-N/scope-N.cpp 2014-01-07 12:22:29 +0000
125+++ demo/scopes/scope-N/scope-N.cpp 2014-01-13 14:22:07 +0000
126@@ -75,7 +75,7 @@
127 EXPORT
128 unity::scopes::ScopeBase*
129 // cppcheck-suppress unusedFunction
130- UNITY_API_SCOPE_CREATE_FUNCTION()
131+ UNITY_SCOPE_CREATE_FUNCTION()
132 {
133 return new MyScope;
134 }
135@@ -83,7 +83,7 @@
136 EXPORT
137 void
138 // cppcheck-suppress unusedFunction
139- UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
140+ UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
141 {
142 delete scope_base;
143 }
144
145=== modified file 'demo/scopes/scope-S/scope-S.cpp'
146--- demo/scopes/scope-S/scope-S.cpp 2014-01-07 12:22:29 +0000
147+++ demo/scopes/scope-S/scope-S.cpp 2014-01-13 14:22:07 +0000
148@@ -108,7 +108,7 @@
149 EXPORT
150 unity::scopes::ScopeBase*
151 // cppcheck-suppress unusedFunction
152- UNITY_API_SCOPE_CREATE_FUNCTION()
153+ UNITY_SCOPE_CREATE_FUNCTION()
154 {
155 return new MyScope;
156 }
157@@ -116,7 +116,7 @@
158 EXPORT
159 void
160 // cppcheck-suppress unusedFunction
161- UNITY_API_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
162+ UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
163 {
164 delete scope_base;
165 }

Subscribers

People subscribed via source and target branches

to all changes: