AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

define wxStrchr(non-const char-or-wchar_t*) as a template to ensure that second parameter of any type that can be used with const version can be used with this one too; this is shorter than listing them all explicitly and without this Borland refuses to compile wxStrchr(char *, wxUniChar) (see #10736)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-04-25 14:12:32 +00:00
parent 1b5f83357d
commit e9b6485645
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/wx/wxcrt.h
View File

@ -722,31 +722,31 @@ inline const T *wxStrpbrk(const S& s, const wxScopedCharTypeBuffer<T>& accept)
/* inlined non-const versions */ /* inlined non-const versions */
inline char *wxStrstr(char *haystack, const char *needle) template <typename T>
inline char *wxStrstr(char *haystack, T needle)
{ return (char *)wxStrstr((const char *)haystack, needle); } { return (char *)wxStrstr((const char *)haystack, needle); }
inline wchar_t *wxStrstr(wchar_t *haystack, const wchar_t *needle) template <typename T>
{ return (wchar_t *)wxStrstr((const wchar_t *)haystack, needle); } inline wchar_t *wxStrstr(wchar_t *haystack, T needle)
inline char *wxStrstr(char *haystack, const wxString& needle)
{ return (char *)wxStrstr((const char *)haystack, needle); }
inline wchar_t *wxStrstr(wchar_t *haystack, const wxString& needle)
{ return (wchar_t *)wxStrstr((const wchar_t *)haystack, needle); } { return (wchar_t *)wxStrstr((const wchar_t *)haystack, needle); }
inline char * wxStrchr(char *s, char c) template <typename T>
inline char * wxStrchr(char *s, T c)
{ return (char *)wxStrchr((const char *)s, c); } { return (char *)wxStrchr((const char *)s, c); }
inline char * wxStrrchr(char *s, char c) template <typename T>
inline char * wxStrchr(wchar_t *s, T c)
{ return (char *)wxStrchr((const char *)s, c); }
template <typename T>
inline char * wxStrrchr(char *s, T c)
{ return (char *)wxStrrchr((const char *)s, c); }
template <typename T>
inline char * wxStrrchr(wchar_t *s, T c)
{ return (char *)wxStrrchr((const char *)s, c); } { return (char *)wxStrrchr((const char *)s, c); }
inline wchar_t * wxStrchr(wchar_t *s, wchar_t c)
{ return (wchar_t *)wxStrchr((const wchar_t *)s, c); }
inline wchar_t * wxStrrchr(wchar_t *s, wchar_t c)
{ return (wchar_t *)wxStrrchr((const wchar_t *)s, c); }
inline char * wxStrpbrk(char *s, const char *accept) template <typename T>
inline char * wxStrpbrk(char *s, T accept)
{ return (char *)wxStrpbrk((const char *)s, accept); } { return (char *)wxStrpbrk((const char *)s, accept); }
inline wchar_t * wxStrpbrk(wchar_t *s, const wchar_t *accept) template <typename T>
{ return (wchar_t *)wxStrpbrk((const wchar_t *)s, accept); } inline wchar_t * wxStrpbrk(wchar_t *s, T accept)
inline char * wxStrpbrk(char *s, const wxString& accept)
{ return (char *)wxStrpbrk((const char *)s, accept); }
inline wchar_t * wxStrpbrk(wchar_t *s, const wxString& accept)
{ return (wchar_t *)wxStrpbrk((const wchar_t *)s, accept); } { return (wchar_t *)wxStrpbrk((const wchar_t *)s, accept); }