maintained C++20 compatibility for Linux (#7268) (#7269)

#changelog #linux

Author: Tomaqa

libs/openFrameworks/gl/ofGLBaseTypes.h

@@ -76,7 +76,7 @@ template<typename T>
 class ofBaseImage_: public ofAbstractImage, virtual public ofBaseHasPixels_<T>{
 public:
 	/// \brief Destroy the ofBaseImage_.
-	virtual ~ofBaseImage_<T>(){};
+	virtual ~ofBaseImage_(){};
 };
 
 
@@ -439,7 +439,7 @@ class ofBaseGLRenderer: public ofBaseRenderer{
 	/// \param material The material to bind to this renderer.
 	/// \sa glMaterialfv()
 	virtual void bind(const ofBaseMaterial & material)=0;
-	
+
 	virtual void bind(const ofShadow & shadow)=0;
 	virtual void bind(const ofShadow & shadow, GLenum aCubeFace)=0;
 
@@ -473,7 +473,7 @@ class ofBaseGLRenderer: public ofBaseRenderer{
 	///
 	/// \param material The material that is currently bound to this renderer.
 	virtual void unbind(const ofBaseMaterial & material)=0;
-	
+
 	virtual void unbind(const ofShadow & shadow)=0;
 	virtual void unbind(const ofShadow & shadow, GLenum aCubeFace)=0;
 

libs/openFrameworks/graphics/ofGraphicsBaseTypes.h

@@ -257,7 +257,7 @@ template<typename T>
 class ofBaseHasPixels_: public ofAbstractHasPixels{
 public:
 	/// \brief Destroy the ofAbstractHasPixels.
-	virtual ~ofBaseHasPixels_<T>(){}
+	virtual ~ofBaseHasPixels_(){}
 
 	/// \brief Get a reference to the underlying ofPixels.
 	/// \returns a reference the underlying ofPixels.

libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk

@@ -137,7 +137,7 @@ PLATFORM_REQUIRED_ADDONS =
 
 PLATFORM_CXXFLAGS = -Wall -Werror=return-type
 PLATFORM_CXXVER = -std=c++17
-	
+
 GCC_MAJOR := $(shell expr `gcc -dumpversion | cut -f1 -d.`)
 GCC_MINOR := $(shell expr `gcc -dumpversion | cut -f2 -d.`)
 
@@ -159,12 +159,17 @@ ifeq ("$(GCC_MAJOR)","4")
 		endif
 	endif
 else
-	ifeq ($(shell expr $(GCC_MAJOR) \>= 8), 1)
-		# c++17 for gcc 8 and newer
-		PLATFORM_CXXVER = -std=c++17
+	ifeq ($(shell expr $(GCC_MAJOR) \>= 10), 1)
+		# c++20 for gcc 10 and newer
+		PLATFORM_CXXVER = -std=c++20
 	else
-		# c++14 for gcc 4 and newer
-		PLATFORM_CXXVER = -std=c++14
+		ifeq ($(shell expr $(GCC_MAJOR) \>= 8), 1)
+			# c++17 for gcc 8 and newer
+			PLATFORM_CXXVER = -std=c++17
+		else
+			# c++14 for gcc 4 and newer
+			PLATFORM_CXXVER = -std=c++14
+		endif
 	endif
 	PLATFORM_CXXFLAGS += -DGCC_HAS_REGEX
 endif