Warning fixes (GCC 5.3)

pavel-kirienko · pavel-kirienko · commit ec84f64f5f19 · 2016-05-05T05:30:49.000+03:00
diff --git a/libuavcan/src/marshal/uc_float_spec.cpp b/libuavcan/src/marshal/uc_float_spec.cpp
@@ -58,7 +58,7 @@ uint16_t IEEE754Converter::nativeIeeeToHalf(float value)
         out = uint16_t(in.u >> 13); /* Take the bits! */
     }
 
-    out |= uint16_t(sign >> 16);
+    out = uint16_t(out | (sign >> 16));
 
     return out;
 }
diff --git a/libuavcan/src/transport/uc_can_io.cpp b/libuavcan/src/transport/uc_can_io.cpp
@@ -314,7 +314,7 @@ uint8_t CanIOManager::makePendingTxMask() const
     {
         if (!tx_queues_[i]->isEmpty())
         {
-            write_mask |= uint8_t(1 << i);
+            write_mask = uint8_t(write_mask | (1 << i));
         }
     }
     return write_mask;

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ uint16_t IEEE754Converter::nativeIeeeToHalf(float value)`
`58`	`58`	`out = uint16_t(in.u >> 13); /* Take the bits! */`
`59`	`59`	`}`
`60`	`60`
`61`		`- out \|= uint16_t(sign >> 16);`
	`61`	`+ out = uint16_t(out \| (sign >> 16));`
`62`	`62`
`63`	`63`	`return out;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ uint8_t CanIOManager::makePendingTxMask() const`
`314`	`314`	`{`
`315`	`315`	`if (!tx_queues_[i]->isEmpty())`
`316`	`316`	`{`
`317`		`- write_mask \|= uint8_t(1 << i);`
	`317`	`+ write_mask = uint8_t(write_mask \| (1 << i));`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`	`return write_mask;`