Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using 'new-style' AssertMacros to support compilation for macOS 10.3 and iOS 11

Browse Source 
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.
This commit is contained in:
Stefan Csomor
2017-07-15 13:30:59 +02:00
parent a770cd8d79
commit 175c62d3f3
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/filefn.cpp
View File

@@ -866,7 +866,7 @@ void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
FSRef fsRef; FSRef fsRef;
wxMacPathToFSRef( path , &fsRef ); wxMacPathToFSRef( path , &fsRef );
err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL); err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
verify_noerr( err ); __Verify_noErr(err);
} }
#endif #endif

2
src/osx/carbon/icon.cpp
View File

@@ -328,7 +328,7 @@ bool wxIcon::LoadIconFromSystemResource(const wxString& resourceName, int desire
if ( theId != 0 ) if ( theId != 0 )
{ {
IconRef iconRef = NULL ; IconRef iconRef = NULL ;
verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ; __Verify_noErr(GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef )) ;
if ( iconRef ) if ( iconRef )
{ {
m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ; m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;

10
src/osx/carbon/region.cpp
View File

@@ -1021,7 +1021,7 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
AllocExclusive(); AllocExclusive();
verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ; __Verify_noErr(HIShapeOffset( M_REGION , x , y )) ;
return true ; return true ;
} }
@@ -1076,11 +1076,11 @@ bool wxRegion::DoCombine(const wxRegion& region, wxRegionOp op)
switch (op) switch (op)
{ {
case wxRGN_AND: 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 ; break ;
case wxRGN_OR: 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 ; break ;
case wxRGN_XOR: 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 // XOR is defined as the difference between union and intersection
wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) ); wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) );
wxCFRef< HIShapeRef > intersectionshape( HIShapeCreateIntersection( 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 ; break ;
case wxRGN_DIFF: 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 ; break ;
case wxRGN_COPY: case wxRGN_COPY:

10
src/osx/carbon/thread.cpp
View File

@@ -163,7 +163,7 @@ wxMutexInternal::wxMutexInternal( wxMutexType WXUNUSED(mutexType) )
m_isOk = false; m_isOk = false;
m_critRegion = kInvalidID; m_critRegion = kInvalidID;
verify_noerr( MPCreateCriticalRegion( &m_critRegion ) ); __Verify_noErr(MPCreateCriticalRegion( &m_critRegion ));
m_isOk = ( m_critRegion != kInvalidID ); m_isOk = ( m_critRegion != kInvalidID );
if ( !IsOk() ) if ( !IsOk() )
{ {
@@ -278,7 +278,7 @@ wxSemaphoreInternal::wxSemaphoreInternal( int initialcount, int maxcount)
// make it practically infinite // make it practically infinite
maxcount = INT_MAX; maxcount = INT_MAX;
verify_noerr( MPCreateSemaphore( maxcount, initialcount, &m_semaphore ) ); __Verify_noErr(MPCreateSemaphore( maxcount, initialcount, &m_semaphore ));
m_isOk = ( m_semaphore != kInvalidID ); m_isOk = ( m_semaphore != kInvalidID );
if ( !IsOk() ) if ( !IsOk() )
@@ -603,7 +603,7 @@ OSStatus wxThreadInternal::MacThreadStart(void *parameter)
wxThreadInternal *pthread = thread->m_internal; wxThreadInternal *pthread = thread->m_internal;
// add to TLS so that This() will work // 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 // have to declare this before pthread_cleanup_push() which defines a
// block! // block!
@@ -1219,8 +1219,8 @@ bool wxThreadModule::OnInit()
} }
// main thread's This() is NULL // main thread's This() is NULL
verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ; __Verify_noErr(MPAllocateTaskStorageIndex( &gs_tlsForWXThread )) ;
verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread, 0 ) ) ; __Verify_noErr(MPSetTaskStorageValue( gs_tlsForWXThread, 0 )) ;
wxThread::ms_idMainThread = wxThread::GetCurrentId(); wxThread::ms_idMainThread = wxThread::GetCurrentId();
gs_critsectWaitingForGui = new wxCriticalSection(); gs_critsectWaitingForGui = new wxCriticalSection();

2
src/osx/core/bitmap.cpp
View File

@@ -973,7 +973,7 @@ IconRef wxBitmap::GetIconRef() const
IconRef wxBitmap::CreateIconRef() const IconRef wxBitmap::CreateIconRef() const
{ {
IconRef icon = GetIconRef(); IconRef icon = GetIconRef();
verify_noerr( AcquireIconRef(icon) ); __Verify_noErr(AcquireIconRef(icon));
return icon; return icon;
} }
#endif #endif