Merge lp:~vanvugt/compiz/fix-1067218 into lp:compiz/0.9.9
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Sam Spilsbury |
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Sam Spilsbury | Approve | ||
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.
FAILED: Continuous integration, rev:3421 jenkins. qa.ubuntu. com/job/ compiz- ci/191/ jenkins. qa.ubuntu. com/job/ compiz- ci/./build= pbuilder, distribution= quantal, flavor= amd64/191/ console
http://
Executed test runs:
FAILURE: http://