Merge branch 'mc/fix-type-warnings'

contrem · contrem · commit b73c449b94bb · 2019-12-09T14:45:34.000-05:00
* mc/fix-type-warnings:
  src:timer: fix conversion warning
diff --git a/src/timer.h b/src/timer.h
@@ -92,7 +92,7 @@ class Timer {
             }
         }
 
-        task = NULL;
+        task = (Task)NULL;
     }
 
     /* Ticks the timer forward - call this function in loop() */
@@ -152,7 +152,7 @@ class Timer {
     Task
     task_id(const struct task * const t)
     {
-        const Task id = (uintptr_t)t;
+        const Task id = (Task)t;
 
         return id ? id ^ t->id : id;
     }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ class Timer {`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`95`		`- task = NULL;`
	`95`	`+ task = (Task)NULL;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/* Ticks the timer forward - call this function in loop() */`
`@@ -152,7 +152,7 @@ class Timer {`
`152`	`152`	`Task`
`153`	`153`	`task_id(const struct task * const t)`
`154`	`154`	`{`
`155`		`- const Task id = (uintptr_t)t;`
	`155`	`+ const Task id = (Task)t;`
`156`	`156`
`157`	`157`	`return id ? id ^ t->id : id;`
`158`	`158`	`}`