[#15] Compilation problems under newer Visual Studios (Part 20: Probl…

…ems with constexpr)
tomas-nestorovic · Nov 28, 2022 · 4e00bb2 · 4e00bb2
1 parent 2dbb3a0
commit 4e00bb2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Main/src/BSDOS.cpp b/Main/src/BSDOS.cpp
@@ -1149,7 +1149,7 @@
 
 
 	namespace MBD{
-		static constexpr CImage::TProperties Properties={
+		static const CImage::TProperties Properties={
 			MAKE_IMAGE_ID('B','S','D','O','S','M','B','D'), // a unique identifier
 			Recognize, // name
 			Instantiate, // instantiation function

diff --git a/Main/src/Charting.cpp b/Main/src/Charting.cpp
@@ -58,7 +58,7 @@
 		//nop (not applicable)
 	}
 
-	static constexpr POINT Origin;
+	static constexpr POINT Origin={0,0};
 
 	const POINT &CChartView::CXyGraphics::GetPoint(int index) const{
 		// returns the XY Point with the specified Index

diff --git a/Main/src/GDOS_Boot.cpp b/Main/src/GDOS_Boot.cpp
@@ -102,7 +102,7 @@
 
 
 	namespace MGT{
-		static constexpr CImage::TProperties Properties={
+		static const CImage::TProperties Properties={
 			MAKE_IMAGE_ID('G','D','O','S','_','M','G','T'), // a unique identifier
 			Recognize,	// list of recognized device names
 			Instantiate,// instantiation function

diff --git a/Main/src/MDOS2_Boot.cpp b/Main/src/MDOS2_Boot.cpp
@@ -409,7 +409,7 @@
 
 
 	namespace D80{
-		static constexpr CImage::TProperties Properties={
+		static const CImage::TProperties Properties={
 			MAKE_IMAGE_ID('M','D','O','S','_','D','x','0'), // a unique identifier
 			Recognize,// name
 			Instantiate,// instantiation function

diff --git a/Main/src/TRDOS503_Boot.cpp b/Main/src/TRDOS503_Boot.cpp
@@ -375,7 +375,7 @@
 
 
 	namespace TRD{
-		static constexpr CImage::TProperties Properties={
+		static const CImage::TProperties Properties={
 			MAKE_IMAGE_ID('T','R','D','O','S','T','R','D'), // a unique identifier
 			Recognize,// name
 			Instantiate,// instantiation function