From 661983a5d612c04f6afe1521d126a881c567af8f Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 31 Mar 2021 03:44:19 -0700 Subject: [PATCH] Mac: fix compile warnings caused by upgrade to C++11 --- client/dhrystone.cpp | 2 +- client/dhrystone.h | 4 ++++ clientgui/sg_PanelBase.cpp | 6 +++--- clientscr/Mac_Saver_Module.h | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/dhrystone.cpp b/client/dhrystone.cpp index 7e2ce0ffd1..3346ae6191 100644 --- a/client/dhrystone.cpp +++ b/client/dhrystone.cpp @@ -94,7 +94,7 @@ int dhrystone( double benchtime; double Dhrystones_Per_Second; - register unsigned long Run_Index; + REG unsigned long Run_Index; Next_Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type)); diff --git a/client/dhrystone.h b/client/dhrystone.h index 018c42c5d0..60a298994d 100644 --- a/client/dhrystone.h +++ b/client/dhrystone.h @@ -1,5 +1,9 @@ +#ifdef __APPLE__ +#define REG +#else #define REG register +#endif typedef enum {Ident_1, Ident_2, Ident_3, Ident_4, Ident_5} Enumeration; diff --git a/clientgui/sg_PanelBase.cpp b/clientgui/sg_PanelBase.cpp index 372df48b17..6e46687d5f 100644 --- a/clientgui/sg_PanelBase.cpp +++ b/clientgui/sg_PanelBase.cpp @@ -63,9 +63,9 @@ void CSimplePanelBase::MakeBGBitMap() { wxBitmap whiteBmp; wxImage bgImage; wxImage whiteImage; - register unsigned char *bgImagePixels; - register unsigned char *whitePixels; - register int i, j, k; + unsigned char *bgImagePixels; + unsigned char *whitePixels; + int i, j, k; CSimpleGUIPanel* backgroundPanel = (CSimpleGUIPanel*)GetParent(); wxPen bgPen(*wxWHITE, 1, wxTRANSPARENT); wxBrush bgBrush(*wxWHITE); diff --git a/clientscr/Mac_Saver_Module.h b/clientscr/Mac_Saver_Module.h index a988a941a4..6bfe39d539 100644 --- a/clientscr/Mac_Saver_Module.h +++ b/clientscr/Mac_Saver_Module.h @@ -27,6 +27,7 @@ // The declarations below must be kept in sync with // the corresponding ones in Mac_Saver_ModuleView.h #ifdef _DEBUG + #undef _T #define _T(x) x #endif