avoid NULL casts, clang says casting nullptr_t is not allowed

closes #15660


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-11-10 17:26:37 +00:00
parent afff80287b
commit ea566e2ed0
2 changed files with 3 additions and 4 deletions

View File

@@ -1801,7 +1801,7 @@ void wxDataViewListStore::SetItemData( const wxDataViewItem& item, wxUIntPtr dat
wxUIntPtr wxDataViewListStore::GetItemData( const wxDataViewItem& item ) const
{
wxDataViewListStoreLine* line = m_data[GetRow(item)];
if (!line) return static_cast<wxUIntPtr>(NULL);
if (!line) return 0;
return line->GetData();
}

View File

@@ -76,9 +76,8 @@ wxXLocale& wxXLocale::GetCLocale()
{
if ( !gs_cLocale )
{
// NOTE: bcc551 has trouble doing static_cast with incomplete
// type definition. reinterpret_cast used as workaround
gs_cLocale = new wxXLocale( reinterpret_cast<wxXLocaleCTag *>(NULL) );
wxXLocaleCTag* tag = NULL;
gs_cLocale = new wxXLocale(tag);
}
return *gs_cLocale;