Merge lp://staging/~smspillaz/compiz-core/fix-timer-warnings-893998 into lp://staging/compiz-core/0.9.5
Proposed by
Sam Spilsbury
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 2909 | ||||
| Proposed branch: | lp://staging/~smspillaz/compiz-core/fix-timer-warnings-893998 | ||||
| Merge into: | lp://staging/compiz-core/0.9.5 | ||||
| Prerequisite: | lp://staging/~smspillaz/compiz-core/fix-893467 | ||||
| Diff against target: |
17 lines (+3/-3) 1 file modified
src/timer/src/timer.cpp (+3/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~smspillaz/compiz-core/fix-timer-warnings-893998 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Approve | ||
| Tim Penhey (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix warnings due to signed/unsigned int comparison in CompTimer
Next pipe: lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class
To post a comment you must log in.
Revision history for this message
| Sam Spilsbury (smspillaz) wrote | # |
Revision history for this message
| Tim Penhey (thumper) | # |
review:
Approve
Revision history for this message
| Daniel van Vugt (vanvugt) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
As per the previous version of this proposal... Looks good, but:
1. Line 17 looks like it will conflict with my existing merge proposal:
https:/
It's only a blank line so should not be hard to resolve.
2. Why prerequisite fix-893467 when it does not seem to be required? This fix alone appears to resolve bug 893998.