Merge lp:~smspillaz/compiz-core/fix-timer-warnings-893998 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix warnings due to signed/unsigned int comparison in CompTimer

Next pipe: lp:~smspillaz/compiz-core/fix_894633_geometry_saver_class

[Daniel van Vugt (vanvugt)]

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://code.launchpad.net/~vanvugt/compiz-core/bettertimers/+merge/82812
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.

review: Needs Information

[lp:~smspillaz/compiz-core/fix-timer-warnings-893998]

2899. By Sam Spilsbury on 2011-12-03

Merged fix-893467 into fix-timer-warnings-893998.

[Sam Spilsbury (smspillaz)]

It's a pipeline

[Tim Penhey (thumper)]

review: Approve

[Daniel van Vugt (vanvugt)]

A pipeline implies serial activity, one fix after the other (?). But proposals would get reviewed faster and with less confusion if they didn't have dependencies so could effectively be reviewed in parallel and independently.

[Daniel van Vugt (vanvugt)]

Approved. Of course, I don't want to be the one slowing us down either :)

review: Approve

[lp:~smspillaz/compiz-core/fix-timer-warnings-893998]

2900. By Sam Spilsbury on 2011-12-05

Merged fix-893467 into fix-timer-warnings-893998.

2901. By Sam Spilsbury on 2011-12-05

Merged fix-893467 into fix-timer-warnings-893998.

2902. By Sam Spilsbury on 2011-12-08

Merged fix-893467 into fix-timer-warnings-893998.

2903. By Sam Spilsbury on 2011-12-08

Merged fix-893467 into fix-timer-warnings-893998.

2904. By Sam Spilsbury on 2011-12-20

Merged fix-893467 into fix-timer-warnings-893998.

2905. By Sam Spilsbury on 2011-12-23

Merged fix-893467 into fix-timer-warnings-893998.

2906. By Sam Spilsbury on 2012-01-04

Merged fix-893467 into fix-timer-warnings-893998.

2907. By Sam Spilsbury on 2012-01-05

Merged fix-893467 into fix-timer-warnings-893998.

2908. By Sam Spilsbury on 2012-01-09

Merged fix-893467 into fix-timer-warnings-893998.

2909. By Sam Spilsbury on 2012-01-09

Merged fix-893467 into fix-timer-warnings-893998.

2910. By Sam Spilsbury on 2012-01-09

Merged fix-893467 into fix-timer-warnings-893998.

2911. By Sam Spilsbury on 2012-01-10

Merged fix-893467 into fix-timer-warnings-893998.

2912. By Sam Spilsbury on 2012-01-11

Merged fix-893467 into fix-timer-warnings-893998.

2913. By Sam Spilsbury on 2012-01-11

Merged fix-893467 into fix-timer-warnings-893998.

[Daniel van Vugt (vanvugt)]

Please remove all changes unrelated to the bug in question (all changes except src/timer/src/timer.cpp).

That will also remove the Prerequisite above. Then please resubmit the proposal with just timer.cpp.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Never mind. I have picked out the relevant part of the branch by hand.

review: Approve

=== modified file 'src/timer/src/timer.cpp'
--- src/timer/src/timer.cpp	2011-12-23 05:12:39 +0000
+++ src/timer/src/timer.cpp	2012-01-11 08:47:25 +0000
@@ -105,10 +105,10 @@
 	while (it != TimeoutHandler::Default ()->timers ().end ())
 	{
 	    t = (*it);
-	    if (t->minLeft () >= timeout)
+	    if (t->minLeft () >= (unsigned int) timeout)
 		break;
-	    if (t->maxLeft () < timeout)
-		timeout = t->maxLeft ();
+	    if (t->maxLeft () < (unsigned int) timeout)
+		timeout = (int) t->maxLeft ();
 	    it++;
 	}
     }