Merge pull request #1 from SmingHub/develop

Fix build warnings/errors in C++20 (#2883)
SmingHub · Sep 23, 2024 · 7aae7e1 · 7aae7e1
2 parents 32cdb63 + e6ed3d9
commit 7aae7e1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/Sming/Components/FlashString b/Sming/Components/FlashString
diff --git a/Sming/Components/Storage/src/include/Storage/Partition.h b/Sming/Components/Storage/src/include/Storage/Partition.h
@@ -281,7 +281,7 @@ class Partition
 	bool read(storage_size_t offset, void* dst, size_t size);
 
 	template <typename T>
-	typename std::enable_if<std::is_pod<T>::value, bool>::type read(storage_size_t offset, T& value)
+	typename std::enable_if<std::is_standard_layout<T>::value, bool>::type read(storage_size_t offset, T& value)
 	{
 		return read(offset, &value, sizeof(value));
 	}

diff --git a/Sming/Wiring/FIFO.h b/Sming/Wiring/FIFO.h
@@ -21,10 +21,10 @@
 
 #include "Countable.h"
 
-template <typename T, int rawSize> class FIFO : public Countable<T>
+template <typename T, unsigned rawSize> class FIFO : public Countable<T>
 {
 public:
-	const int size; // speculative feature, in case it's needed
+	const unsigned size; // speculative feature, in case it's needed
 
 	FIFO();
 
@@ -60,18 +60,18 @@ template <typename T, int rawSize> class FIFO : public Countable<T>
 	}
 
 protected:
-	volatile int numberOfElements;
-	int nextIn;
-	int nextOut;
+	unsigned numberOfElements;
+	unsigned nextIn;
+	unsigned nextOut;
 	T raw[rawSize];
 };
 
-template <typename T, int rawSize> FIFO<T, rawSize>::FIFO() : size(rawSize)
+template <typename T, unsigned rawSize> FIFO<T, rawSize>::FIFO() : size(rawSize)
 {
 	flush();
 }
 
-template <typename T, int rawSize> bool FIFO<T, rawSize>::enqueue(T element)
+template <typename T, unsigned rawSize> bool FIFO<T, rawSize>::enqueue(T element)
 {
 	if(full()) {
 		return false;
@@ -85,7 +85,7 @@ template <typename T, int rawSize> bool FIFO<T, rawSize>::enqueue(T element)
 	return true;
 }
 
-template <typename T, int rawSize> T FIFO<T, rawSize>::dequeue()
+template <typename T, unsigned rawSize> T FIFO<T, rawSize>::dequeue()
 {
 	T item;
 	numberOfElements--;
@@ -95,12 +95,12 @@ template <typename T, int rawSize> T FIFO<T, rawSize>::dequeue()
 	return item;
 }
 
-template <typename T, int rawSize> T FIFO<T, rawSize>::peek() const
+template <typename T, unsigned rawSize> T FIFO<T, rawSize>::peek() const
 {
 	return raw[nextOut];
 }
 
-template <typename T, int rawSize> void FIFO<T, rawSize>::flush()
+template <typename T, unsigned rawSize> void FIFO<T, rawSize>::flush()
 {
 	nextIn = nextOut = numberOfElements = 0;
 }

diff --git a/Sming/Wiring/FILO.h b/Sming/Wiring/FILO.h
@@ -20,10 +20,10 @@
 
 #include "Countable.h"
 
-template <typename T, int rawSize> class FILO : public Countable<T>
+template <typename T, unsigned rawSize> class FILO : public Countable<T>
 {
 public:
-	const int size; // speculative feature, in case it's needed
+	const unsigned size; // speculative feature, in case it's needed
 
 	FILO();
 
@@ -59,18 +59,18 @@ template <typename T, int rawSize> class FILO : public Countable<T>
 	}
 
 private:
-	volatile int numberOfElements;
-	int nextIn;
-	int nextOut;
+	unsigned numberOfElements;
+	unsigned nextIn;
+	unsigned nextOut;
 	T raw[rawSize];
 };
 
-template <typename T, int rawSize> FILO<T, rawSize>::FILO() : size(rawSize)
+template <typename T, unsigned rawSize> FILO<T, rawSize>::FILO() : size(rawSize)
 {
 	flush();
 }
 
-template <typename T, int rawSize> bool FILO<T, rawSize>::push(T element)
+template <typename T, unsigned rawSize> bool FILO<T, rawSize>::push(T element)
 {
 	if(count() >= rawSize) {
 		return false;
@@ -79,23 +79,23 @@ template <typename T, int rawSize> bool FILO<T, rawSize>::push(T element)
 	return true;
 }
 
-template <typename T, int rawSize> T FILO<T, rawSize>::pop()
+template <typename T, unsigned rawSize> T FILO<T, rawSize>::pop()
 {
 	if(numberOfElements > 0) {
 		return raw[--numberOfElements];
 	}
 	return raw[0];
 }
 
-template <typename T, int rawSize> T FILO<T, rawSize>::peek() const
+template <typename T, unsigned rawSize> T FILO<T, rawSize>::peek() const
 {
 	if(numberOfElements > 0) {
 		return raw[numberOfElements - 1];
 	}
 	return raw[0];
 }
 
-template <typename T, int rawSize> void FILO<T, rawSize>::flush()
+template <typename T, unsigned rawSize> void FILO<T, rawSize>::flush()
 {
 	nextIn = nextOut = numberOfElements = 0;
 }
diff --git a/Sming/build.mk b/Sming/build.mk
@@ -239,6 +239,11 @@ COMPILER_VERSION_FULL	:= $(shell LANG=C $(CC) -v 2>&1 | $(AWK) -F " version " '/
 COMPILER_NAME			:= $(word 1,$(COMPILER_VERSION_FULL))
 COMPILER_VERSION		:= $(word 2,$(COMPILER_VERSION_FULL))
 
+# Use of bitwise assignment for volatile registers is deprecated in C++20 but de-deprecated in C++23
+ifeq ($(COMPILER_NAME)-$(SMING_CXX_STD),gcc-c++20)
+CXXFLAGS += -Wno-volatile
+endif
+
 ifndef USE_CLANG
 # Required to access peripheral registers using structs
 # e.g. `uint32_t value: 8` sitting at a byte or word boundary will be 'optimised' to