adjustments for recent gcc version, formatting improved

Author: tsandmann

lib/cpputils_avr/src/serial_port.cpp

@@ -35,17 +35,17 @@ namespace avr {
 
 void SerialPort::begin(const uint32_t baud) const {
     /* try u2x mode first */
-    uint16_t baud_setting = (F_CPU / 4UL / baud - 1UL) / 2UL;
+    uint16_t baud_setting = static_cast<uint16_t>((F_CPU / 4UL / baud - 1UL) / 2UL);
     UCSR0A = BV_8(U2X0);
 
     /* the baud_setting cannot be > 4095, so switch back to non-u2x mode if the baud rate is too low */
     if (baud_setting > 4095U) {
         UCSR0A = 0;
-        baud_setting = (F_CPU / 8UL / baud - 1UL) / 2UL;
+        baud_setting = static_cast<uint16_t>((F_CPU / 8UL / baud - 1UL) / 2UL);
     }
 
     /* assign the baud_setting, a.k.a. ubrr (USART Baud Rate Register) */
-    UBRR0H = baud_setting >> 8;
+    UBRR0H = static_cast<uint8_t>(baud_setting >> 8);
     UBRR0L = baud_setting & 0xff;
 
     /* set the data bits, parity, and stop bits */
@@ -62,7 +62,7 @@ void SerialPort::end() {
 
     /* disable UART0 */
     uint8_t tmp { UCSR0B };
-    tmp &= ~(RXEN0 | TXEN0 | RXCIE0 | UDRIE0);
+    tmp = static_cast<uint8_t>(tmp & ~(RXEN0 | TXEN0 | RXCIE0 | UDRIE0));
     UCSR0B = tmp;
 
     /* clear any received data */
@@ -76,8 +76,8 @@ void SerialPort::flush() const {
 }
 
 int16_t SerialPort::read() {
-    ExecuteAtomic<std::is_same<uint8_t, rx_buf_idx_t>::value> x;
-    const rx_buf_idx_t head { x([this]() { return rx_buf_head_; }) };
+    ExecuteAtomic<std::is_same<uint8_t, rx_buf_idx_t>::value> x1;
+    const rx_buf_idx_t head { x1([this]() { return rx_buf_head_; }) };
 
     if (head == rx_buf_tail_) {
         // if the head isn't ahead of the tail, we don't have any characters
@@ -86,8 +86,8 @@ int16_t SerialPort::read() {
         const uint8_t c { rx_buffer_[rx_buf_tail_] };
         const rx_buf_idx_t new_tail { static_cast<rx_buf_idx_t>(static_cast<rx_buf_idx_t>(rx_buf_tail_ + 1U) % sizeof(rx_buffer_)) };
 
-        ExecuteAtomic<std::is_same<uint8_t, rx_buf_idx_t>::value> x;
-        x([this, new_tail]() { rx_buf_tail_ = new_tail; });
+        ExecuteAtomic<std::is_same<uint8_t, rx_buf_idx_t>::value> x2;
+        x2([this, new_tail]() { rx_buf_tail_ = new_tail; });
 
         return static_cast<int16_t>(c);
     }

lib/cpputils_avr/src/utils_avr.h

@@ -122,7 +122,7 @@ inline static constexpr uint16_t BV_16(const uint8_t bit) {
 template <typename T>
 inline static void CBI(volatile T* sfr, const uint8_t bit) {
     const T mask { BV<T>(bit) };
-    *sfr &= ~mask;
+    *sfr = static_cast<T>(*sfr & ~mask);
 }
 
 /**
@@ -135,7 +135,7 @@ template <typename T>
 inline static void CBI(intptr_t sfr, const uint8_t bit) {
     auto ptr(PTR<T>(sfr));
     const T mask { BV<T>(bit) };
-    *ptr &= ~mask;
+    *ptr = static_cast<T>(*ptr & ~mask);
 }
 
 /**

lib/rc5/rc5.cpp

@@ -78,16 +78,16 @@ bool RC5::read(uint16_t& message, const bool value, const uint32_t elapsed) {
 
 bool RC5::read(bool& toggle, uint8_t& addr, uint8_t& cmd, const bool value, const uint32_t elapsed) {
     uint16_t msg;
-    if (! read(msg, value, elapsed)) {
+    if (!read(msg, value, elapsed)) {
         return false;
     }
 
     toggle = (msg & TOGGLE_MASK) >> TOGGLE_SHIFT;
-    addr = (msg & ADDRESS_MASK) >> ADDRESS_SHIFT;
+    addr = static_cast<uint8_t>((msg & ADDRESS_MASK) >> ADDRESS_SHIFT);
 
     // Support for extended RC5: to get extended command, invert S2 and shift into command's 7th bit
     const uint8_t extended { static_cast<uint8_t>((~msg & S2_MASK) >> (S2_SHIFT - 7)) };
-    cmd = ((msg & COMMAND_MASK) >> COMMAND_SHIFT) | extended;
+    cmd = static_cast<uint8_t>(((msg & COMMAND_MASK) >> COMMAND_SHIFT) | extended);
 
     reset();
 

lib/uclibcpp/src/abi/abi.cpp

@@ -1,20 +1,20 @@
 /*	Copyright (C) 2004 Garrett A. Kajmowicz
 
-	This file is part of the uClibc C++ Library.  This library is free
-	software; you can redistribute it and/or modify it under the
-	terms of the GNU General Public License as published by the
-	Free Software Foundation; either version 2, or (at your option)
-	any later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License along
-	with this library; see the file COPYING.  If not, write to the Free
-	Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-	USA.
+    This file is part of the uClibc C++ Library.  This library is free
+    software; you can redistribute it and/or modify it under the
+    terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this library; see the file COPYING.  If not, write to the Free
+    Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+    USA.
 */
 
 #include <cstdlib>
@@ -29,17 +29,18 @@
 extern "C" {
 
 #if defined(ARDUINO)
-        /* Arduino defines some of these.
-	 * There can be link issues if they're redefined
-         */
+/* Arduino defines some of these.
+ * There can be link issues if they're redefined
+ */
 #else
-	/* This function is called in the event that a non-overidden
-	 * pure virtual function is called.  The compiler should never
-	 * let that happen.  We get to choose what to do - we will abort
-	 */
-	void __cxa_pure_virtual (){
-		abort();
-	}
+void __cxa_pure_virtual();
+/* This function is called in the event that a non-overidden
+ * pure virtual function is called.  The compiler should never
+ * let that happen.  We get to choose what to do - we will abort
+ */
+void __cxa_pure_virtual() {
+    abort();
+}
 
 #endif
 }