Merge lp:~bregma/compiz/lp-1085581 into lp:compiz/0.9.9
Status: | Merged |
---|---|
Approved by: | Didier Roche-Tolomelli |
Approved revision: | 3501 |
Merged at revision: | 3500 |
Proposed branch: | lp:~bregma/compiz/lp-1085581 |
Merge into: | lp:compiz/0.9.9 |
Diff against target: |
31 lines (+8/-2) 2 files modified
src/screen.cpp (+4/-1) src/window.cpp (+4/-1) |
To merge this branch: | bzr merge lp:~bregma/compiz/lp-1085581 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+137880@code.launchpad.net |
Commit message
Move plugin initialization code out of assert() macro so it still runs even with NDEBUG defined (lp: #1085581).
Description of the change
= Problem description =
Plugins fail to run when compiz is build using the latest cmake.
= The fix =
Turns out the latest cmake adds a macro definition for NDEBUG when building in release mode (where previously it did not do so). That macro removes code inside an assert() macro, and plugin initialization code in compiz was wrapped in such a macro.
This fix moves that code outside of the macro and checks the result of the code in the macro instead.
= Test coverage =
Existing tests were failing: this change should cause those tests to pass once again.
Way saner.