Merge lp://qastaging/~bregma/compiz/lp-1477654 into lp://qastaging/compiz/0.9.12

Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3960
Merged at revision: 3961
Proposed branch: lp://qastaging/~bregma/compiz/lp-1477654
Merge into: lp://qastaging/compiz/0.9.12
Diff against target: 111 lines (+16/-14)
3 files modified
plugins/decor/src/decor.cpp (+1/-1)
plugins/opengl/src/programcache.cpp (+9/-7)
plugins/splash/src/splash.cpp (+6/-6)
To merge this branch: bzr merge lp://qastaging/~bregma/compiz/lp-1477654
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+265716@code.qastaging.launchpad.net

Commit message

Fix a FTBFS when -std=c++11 is used.

Description of the change

Fix a FTBFS when -std=c++11 is used.

To post a comment you must log in.
3960. By Stephen M. Webb

fixed incorrect ordering of intialization

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Ok, looks good.

review: Approve
3961. By Stephen M. Webb

silenced a warning from GCC5

3962. By Stephen M. Webb

decor: fix logic for operator binding

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches