From 175c62d3f31c4e0386c0b3e189c7ef7a7965a6d2 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 15 Jul 2017 13:30:59 +0200
Subject: [PATCH] Using 'new-style' AssertMacros to support compilation for
 macOS 10.3 and iOS 11

To avoid collisions with boost and c++ standard library using the assert macros starting with two underscores is the default under these new SDKs. Since they already existed in our minimum deploment SDK we can switch them safely.
---
 src/common/filefn.cpp     |  2 +-
 src/osx/carbon/icon.cpp   |  2 +-
 src/osx/carbon/region.cpp | 10 +++++-----
 src/osx/carbon/thread.cpp | 10 +++++-----
 src/osx/core/bitmap.cpp   |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 6da74a7ea4..ff894392ed 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -866,7 +866,7 @@ void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
     FSRef fsRef;
     wxMacPathToFSRef( path , &fsRef );
     err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-    verify_noerr( err );
+    __Verify_noErr(err);
 }
 #endif
 
diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index d441c432cb..1d74771428 100644
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -328,7 +328,7 @@ bool wxIcon::LoadIconFromSystemResource(const wxString& resourceName, int desire
     if ( theId != 0 )
     {
         IconRef iconRef = NULL ;
-        verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
+        __Verify_noErr(GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef )) ;
         if ( iconRef )
         {
             m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;
diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index 6d4a38ad40..a881b0996a 100644
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -1021,7 +1021,7 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 
     AllocExclusive();
 
-    verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;
+    __Verify_noErr(HIShapeOffset( M_REGION , x , y )) ;
 
     return true ;
 }
@@ -1076,11 +1076,11 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
     switch (op)
     {
         case wxRGN_AND:
-            verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
+            __Verify_noErr(HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ));
             break ;
 
         case wxRGN_OR:
-            verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
+            __Verify_noErr(HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ));
             break ;
 
         case wxRGN_XOR:
@@ -1088,12 +1088,12 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
                 // XOR is defined as the difference between union and intersection
                 wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) );
                 wxCFRef< HIShapeRef > intersectionshape( HIShapeCreateIntersection( M_REGION , OTHER_M_REGION(region) ) );
-                verify_noerr( HIShapeDifference( unionshape, intersectionshape, M_REGION ) );
+                __Verify_noErr(HIShapeDifference( unionshape, intersectionshape, M_REGION ));
             }
             break ;
 
         case wxRGN_DIFF:
-            verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ;
+            __Verify_noErr(HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION )) ;
             break ;
 
         case wxRGN_COPY:
diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index f62bd70f4e..a9a221bb90 100644
--- a/src/osx/carbon/thread.cpp
+++ b/src/osx/carbon/thread.cpp
@@ -163,7 +163,7 @@ wxMutexInternal::wxMutexInternal( wxMutexType WXUNUSED(mutexType) )
     m_isOk = false;
     m_critRegion = kInvalidID;
 
-    verify_noerr( MPCreateCriticalRegion( &m_critRegion ) );
+    __Verify_noErr(MPCreateCriticalRegion( &m_critRegion ));
     m_isOk = ( m_critRegion != kInvalidID );
     if ( !IsOk() )
     {
@@ -278,7 +278,7 @@ wxSemaphoreInternal::wxSemaphoreInternal( int initialcount, int maxcount)
         // make it practically infinite
         maxcount = INT_MAX;
 
-    verify_noerr( MPCreateSemaphore( maxcount, initialcount, &m_semaphore ) );
+    __Verify_noErr(MPCreateSemaphore( maxcount, initialcount, &m_semaphore ));
     m_isOk = ( m_semaphore != kInvalidID );
 
     if ( !IsOk() )
@@ -603,7 +603,7 @@ OSStatus wxThreadInternal::MacThreadStart(void *parameter)
     wxThreadInternal *pthread = thread->m_internal;
 
     // add to TLS so that This() will work
-    verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (TaskStorageValue) thread ) ) ;
+    __Verify_noErr(MPSetTaskStorageValue( gs_tlsForWXThread , (TaskStorageValue) thread )) ;
 
     // have to declare this before pthread_cleanup_push() which defines a
     // block!
@@ -1219,8 +1219,8 @@ bool wxThreadModule::OnInit()
     }
 
     // main thread's This() is NULL
-    verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
-    verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread, 0 ) ) ;
+    __Verify_noErr(MPAllocateTaskStorageIndex( &gs_tlsForWXThread )) ;
+    __Verify_noErr(MPSetTaskStorageValue( gs_tlsForWXThread, 0 )) ;
 
     wxThread::ms_idMainThread = wxThread::GetCurrentId();
     gs_critsectWaitingForGui = new wxCriticalSection();
diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index bd97d66fc8..5134e97553 100644
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -973,7 +973,7 @@ IconRef wxBitmap::GetIconRef() const
 IconRef wxBitmap::CreateIconRef() const
 {
     IconRef icon = GetIconRef();
-    verify_noerr( AcquireIconRef(icon) );
+    __Verify_noErr(AcquireIconRef(icon));
     return icon;
 }
 #endif