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

Replace wx_static_cast/wx_const_cast/wx_reinterpret_cast with the function-style casts

Browse Source 
See #17655.
This commit is contained in:
ARATA Mizuki
2016-08-30 18:07:32 +09:00
parent b99d28bb46
commit 1e6251d592
7 changed files with 11 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/defs.h
View File

@@ -337,7 +337,7 @@ typedef short int WXTYPE;
#endif
/* for consistency with wxStatic/DynamicCast defined in wx/object.h */
#define wxConstCast(obj, className) wx_const_cast(className *, obj)
#define wxConstCast(obj, className) const_cast<className *>(obj)
#ifndef HAVE_STD_WSTRING
#if __cplusplus >= 201103L
@@ -1284,7 +1284,7 @@ inline wxUIntPtr wxPtrToUInt(const void *p)
#pragma warning(disable: 1684)
#endif
return wx_reinterpret_cast(wxUIntPtr, p);
return reinterpret_cast<wxUIntPtr>(p);
#if defined(__VISUALC__) || defined(__INTELC__)
#pragma warning(pop)
@@ -1303,7 +1303,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
#pragma warning(disable: 171)
#endif
return wx_reinterpret_cast(void *, p);
return reinterpret_cast<void *>(p);
#if defined(__VISUALC__) || defined(__INTELC__)
#pragma warning(pop)

2
include/wx/dlist.h
View File

@@ -238,7 +238,7 @@ public:
Node *GetNext() const { return m_next; }
Node *GetPrevious() const { return m_previous; }
T *GetData() const { return m_data; }
T **GetDataPtr() const { return &(wx_const_cast(nodetype*,this)->m_data); }
T **GetDataPtr() const { return &(const_cast<nodetype*>(this)->m_data); }
void SetData( T *data ) { m_data = data; }
int IndexOf() const