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

Proposed by Daniel van Vugt on 2012-10-16
Status: Merged
Approved by: Sam Spilsbury on 2012-10-16
Approved revision: 3421
Merged at revision: 3427
Proposed branch: lp:~vanvugt/compiz/fix-1067218
Merge into: lp:compiz/0.9.9
Diff against target: 44 lines (+7/-2)
3 files modified
plugins/opengl/CMakeLists.txt (+2/-2)
src/region/include/core/region.h (+3/-0)
src/region/src/region.cpp (+2/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1067218
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2012-10-16
Sam Spilsbury 2012-10-16 Approve on 2012-10-16
Review via email: mp+129807@code.launchpad.net

Commit message

Templates relating to CompRegion should only be instantiated in core and
never in any plugins.
(LP: #1067218)

Note: This required removing -std=c++0x from the opengl plugin. That flag
was causing opengl to have slightly different symbol requirements to the
template instance in core. Not that it matters because -std=c++0x appears to
have been unused by opengl.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Sam Spilsbury (smspillaz) :
review: Approve
Sam Spilsbury (smspillaz) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/opengl/CMakeLists.txt'
2--- plugins/opengl/CMakeLists.txt 2012-09-22 04:00:52 +0000
3+++ plugins/opengl/CMakeLists.txt 2012-10-16 07:05:21 +0000
4@@ -15,11 +15,11 @@
5 include_directories (src/glxtfpbind/include)
6
7 if (USE_GLES)
8- compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGLES2_INCLUDE_DIR})
9+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGLES2_INCLUDE_DIR})
10 else (USE_GLES)
11 find_package (OpenGL)
12 if (OPENGL_FOUND)
13- compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
14+ compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
15 endif (OPENGL_FOUND)
16 endif (USE_GLES)
17
18
19=== modified file 'src/region/include/core/region.h'
20--- src/region/include/core/region.h 2012-05-21 06:43:20 +0000
21+++ src/region/include/core/region.h 2012-10-16 07:05:21 +0000
22@@ -32,6 +32,9 @@
23 #include <core/rect.h>
24 #include <core/point.h>
25
26+class CompRegion;
27+extern template class std::vector<CompRegion>;
28+
29 /**
30 * A 2D region with an (x,y) position and arbitrary dimensions similar to
31 * an XRegion. It's data membmers are private and must be manipulated with
32
33=== modified file 'src/region/src/region.cpp'
34--- src/region/src/region.cpp 2012-05-21 06:43:20 +0000
35+++ src/region/src/region.cpp 2012-10-16 07:05:21 +0000
36@@ -36,6 +36,8 @@
37 #include <boost/foreach.hpp>
38 #define foreach BOOST_FOREACH
39
40+template class std::vector<CompRegion>;
41+
42 const CompRegion infiniteRegion (CompRect (MINSHORT, MINSHORT,
43 MAXSHORT * 2, MAXSHORT * 2));
44 const CompRegion emptyRegion;

Subscribers

People subscribed via source and target branches