Compiz

Merge lp:~vanvugt/compiz/fix-1066798-1066795 into lp:compiz/0.9.9

  1. fix-1066798-1066795
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Martin Mrazik
Approved revision: 3418
Merged at revision: 3423
Proposed branch: lp:~vanvugt/compiz/fix-1066798-1066795
Merge into: lp:compiz/0.9.9
Diff against target: 45 lines (+7/-0)
3 files modified
plugins/opengl/include/opengl/opengl.h (+4/-0)
plugins/opengl/src/screen.cpp (+2/-0)
plugins/opengl/src/window.cpp (+1/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1066798-1066795
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Sam Spilsbury Approve
Review via email: mp+129799@code.launchpad.net

Commit message

Templates related to the opengl plugin should only be instantiated in the
opengl plugin. Ensure users of opengl.h don't also get local copies
instantiated.
(LP: #1066795) (LP: #1066798)

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

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

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve
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/compiz-mbs-autolanding/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/14/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Infrastructure problem. Sorry for that and re-approving.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/opengl/include/opengl/opengl.h'
2--- plugins/opengl/include/opengl/opengl.h 2012-10-12 09:05:18 +0000
3+++ plugins/opengl/include/opengl/opengl.h 2012-10-16 04:54:21 +0000
4@@ -580,6 +580,8 @@
5
6 class GLScreen;
7 class GLFramebufferObject;
8+class GLScreenInterface;
9+extern template class WrapableInterface<GLScreen, GLScreenInterface>;
10
11 class GLScreenInterface :
12 public WrapableInterface<GLScreen, GLScreenInterface>
13@@ -808,6 +810,8 @@
14 };
15
16 class GLWindow;
17+class GLWindowInterface;
18+extern template class WrapableInterface<GLWindow, GLWindowInterface>;
19
20 class GLWindowInterface :
21 public WrapableInterface<GLWindow, GLWindowInterface>
22
23=== modified file 'plugins/opengl/src/screen.cpp'
24--- plugins/opengl/src/screen.cpp 2012-10-12 09:05:18 +0000
25+++ plugins/opengl/src/screen.cpp 2012-10-16 04:54:21 +0000
26@@ -37,6 +37,8 @@
27 #include <dlfcn.h>
28 #include <math.h>
29
30+template class WrapableInterface<GLScreen, GLScreenInterface>;
31+
32 using namespace compiz::opengl;
33
34 namespace GL {
35
36=== modified file 'plugins/opengl/src/window.cpp'
37--- plugins/opengl/src/window.cpp 2012-10-12 09:05:18 +0000
38+++ plugins/opengl/src/window.cpp 2012-10-16 04:54:21 +0000
39@@ -27,6 +27,7 @@
40
41 #include "privates.h"
42
43+template class WrapableInterface<GLWindow, GLWindowInterface>;
44
45 template class PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>;
46

Subscribers

People subscribed via source and target branches