Mac: fix compile warnings caused by upgrade to C++11

BOINC · Mar 31, 2021 · 661983a · 661983a
1 parent 7710c0f
commit 661983a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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