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

wxMemxxx --> wxTmemxxx, get rid of wxdocmpxxx impossible case

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-21 17:44:40 +00:00
parent 4130044adf
commit 2c09fb3b8b
4 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/wxchar.h
View File

@@ -1115,7 +1115,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
#include <string.h> //for mem funcs
//implement our own wmem variants
inline wxChar* wxMemchr(const wxChar* s, wxChar c, size_t l)
inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
{
for(;l && *s != c;--l, ++s) {}
@@ -1124,7 +1124,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
return NULL;
}
inline int wxMemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
inline int wxTmemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
{
for(; *sz1 == *sz2 && len; --len, ++sz1, ++sz2) {}
@@ -1134,17 +1134,17 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
return 0;
}
inline wxChar* wxMemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
inline wxChar* wxTmemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
{
return (wxChar*) memcpy(szOut, szIn, len * sizeof(wxChar));
}
inline wxChar* wxMemmove(wxChar* szOut, const wxChar* szIn, size_t len)
inline wxChar* wxTmemmove(wxChar* szOut, const wxChar* szIn, size_t len)
{
return (wxChar*) memmove(szOut, szIn, len * sizeof(wxChar));
}
inline wxChar* wxMemset(wxChar* szOut, const wxChar cIn, size_t len)
inline wxChar* wxTmemset(wxChar* szOut, const wxChar cIn, size_t len)
{
wxChar* szRet = szOut;
@@ -1155,11 +1155,11 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
}
#else //!wxUSE_UNICODE
# define wxMemchr memchr
# define wxMemcmp memcmp
# define wxMemcpy memcpy
# define wxMemmove memmove
# define wxMemset memset
# define wxTmemchr memchr
# define wxTmemcmp memcmp
# define wxTmemcpy memcpy
# define wxTmemmove memmove
# define wxTmemset memset
#endif
#endif /*__cplusplus*/