Compiz

Merge lp:~vanvugt/compiz/fix-1067219 into lp:compiz/0.9.9

  1. fix-1067219
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3421
Merged at revision: 3428
Proposed branch: lp:~vanvugt/compiz/fix-1067219
Merge into: lp:compiz/0.9.9
Diff against target: 24 lines (+3/-0)
2 files modified
src/rect/include/core/rect.h (+2/-0)
src/rect/src/rect.cpp (+1/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1067219
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+129806@code.launchpad.net

Commit message

Ensure template instances relating to CompRect are only instantiated in core
and never in any plugin.
(LP: #1067219)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/189/console

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/rect/include/core/rect.h'
2--- src/rect/include/core/rect.h 2012-01-19 19:32:29 +0000
3+++ src/rect/include/core/rect.h 2012-10-16 06:55:23 +0000
4@@ -138,6 +138,8 @@
5 REGION mRegion;
6 };
7
8+extern template class std::vector<CompRect>;
9+
10 namespace compiz
11 {
12 namespace rect
13
14=== modified file 'src/rect/src/rect.cpp'
15--- src/rect/src/rect.cpp 2012-01-19 19:32:29 +0000
16+++ src/rect/src/rect.cpp 2012-10-16 06:55:23 +0000
17@@ -29,6 +29,7 @@
18 #include <math.h>
19 #include <stdlib.h>
20
21+template class std::vector<CompRect>;
22
23 CompRect::CompRect ()
24 {

Subscribers

People subscribed via source and target branches