Switch to C++20

spillerrec · May 1, 2024 · fdade00 · fdade00
1 parent b1ceebf
commit fdade00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -114,5 +114,5 @@ if(MATH_LIBRARY)
 endif()
 
 # C++17
-set_property(TARGET OvermixCore PROPERTY CXX_STANDARD 17)
+set_property(TARGET OvermixCore PROPERTY CXX_STANDARD 20)
 set_property(TARGET OvermixCore PROPERTY CXX_STANDARD_REQUIRED ON)
diff --git a/src/Geometry.hpp b/src/Geometry.hpp
@@ -43,10 +43,10 @@ struct Point{
 	template<typename T2>
 	Point( const Point<T2>& p ) : x( p.x ), y( p.y ) { }
 
-	Point<T>( QPoint  p ) : x( p.x()     ), y( p.y()      ) { }
-	Point<T>( QPointF p ) : x( p.x()     ), y( p.y()      ) { }
-	Point<T>( QSize   p ) : x( p.width() ), y( p.height() ) { }
-	Point<T>( QSizeF  p ) : x( p.width() ), y( p.height() ) { }
+	Point( QPoint  p ) : x( p.x()     ), y( p.y()      ) { }
+	Point( QPointF p ) : x( p.x()     ), y( p.y()      ) { }
+	Point( QSize   p ) : x( p.width() ), y( p.height() ) { }
+	Point( QSizeF  p ) : x( p.width() ), y( p.height() ) { }
 
 	double lenght() const{ return std::sqrt( x*x + y*y ); }
 	double manhattanLength() const{ return x+y; }

diff --git a/src/planes/ImageEx.hpp b/src/planes/ImageEx.hpp
@@ -112,7 +112,7 @@ class ImageEx{
 
 		Point<unsigned> getSize() const{
 			return std::accumulate( planes.begin(), planes.end(), Point<unsigned>( 0, 0 )
-				,	[]( auto& acc, auto& info ){ return acc.max( info.p.getSize() ); } );
+				,	[]( const auto& acc, const auto& info ){ return acc.max( info.p.getSize() ); } );
 		}
 		unsigned get_width()  const{ return getSize().width(); }
 		unsigned get_height() const{ return getSize().height(); }