OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std_cstring.h: Fix for const-correctness.

Browse Source 
2001-04-02  Stephen M. Webb  <stephen@bregmasoft.com>

	* include/c_std/bits/std_cstring.h: Fix for const-correctness.
	* include/c_std/bits/std_cwchar.h: Same.
	* testsuite/21_strings/c_strings.cc: Add.

From-SVN: r41019
This commit is contained in:
Stephen M. Webb 2001-04-02 22:51:25 +00:00 committed by Benjamin Kosnik
parent 57df35602e
commit 92c3688a97
3 changed files with 66 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2001-04-02 Stephen M. Webb <stephen@bregmasoft.com>
* include/c_std/bits/std_cstring.h: Fix for const-correctness.
* include/c_std/bits/std_cwchar.h: Same.
* testsuite/21_strings/c_strings.cc: Add.
2001-04-01 Benjamin Kosnik <bkoz@codesourcery.com> 2001-04-01 Benjamin Kosnik <bkoz@codesourcery.com>
* docs/html/configopts.html: Add --enable-sjlj-exceptions docs. * docs/html/configopts.html: Add --enable-sjlj-exceptions docs.

35
libstdc++-v3/include/c_std/bits/std_cstring.h
View File

@ -79,13 +79,38 @@ namespace std
extern "C" int strcoll(const char*, const char*); extern "C" int strcoll(const char*, const char*);
extern "C" int strncmp(const char*, const char*, size_t); extern "C" int strncmp(const char*, const char*, size_t);
extern "C" size_t strxfrm(char*, const char*, size_t); extern "C" size_t strxfrm(char*, const char*, size_t);
extern "C" void* memchr(const void*, int, size_t); extern "C" const void* memchr(const void*, int, size_t);
extern "C" char* strchr(const char*, int); inline void*
memchr(void* __p, int __c, size_t __n)
{
return const_cast<void*>(memchr(const_cast<const void*>(__p), __c, __n));
}
extern "C" const char* strchr(const char*, int);
inline char*
strchr(char* __s1, int __n)
{
return const_cast<char*>(strchr(const_cast<const char*>(__s1), __n));
}
extern "C" size_t strcspn(const char*, const char*); extern "C" size_t strcspn(const char*, const char*);
extern "C" char* strpbrk(const char*, const char*); extern "C" const char* strpbrk(const char*, const char*);
extern "C" char* strrchr(const char*, int); inline char*
strpbrk(char* __s1, const char* __s2)
{
return const_cast<char*>(strpbrk(const_cast<const char*>(__s1), __s2));
}
extern "C" const char* strrchr(const char*, int);
inline char*
strrchr(char* __s1, int __n)
{
return const_cast<char*>(strrchr(const_cast<const char*>(__s1), __n));
}
extern "C" size_t strspn(const char*, const char*); extern "C" size_t strspn(const char*, const char*);
extern "C" char* strstr(const char*, const char*); extern "C" const char* strstr(const char*, const char*);
inline char*
strstr(char* __s1, const char* __s2)
{
return const_cast<char*>(strstr(const_cast<const char*>(__s1), __s2));
}
extern "C" char* strtok(char*, const char*); extern "C" char* strtok(char*, const char*);
extern "C" void* memset(void*, int, size_t); extern "C" void* memset(void*, int, size_t);
extern "C" char* strerror(int); extern "C" char* strerror(int);

35
libstdc++-v3/include/c_std/bits/std_cwchar.h
View File

@ -157,15 +157,40 @@ namespace std
extern "C" int wcscoll(const wchar_t*, const wchar_t*); extern "C" int wcscoll(const wchar_t*, const wchar_t*);
extern "C" int wcsncmp(const wchar_t*, const wchar_t*, size_t); extern "C" int wcsncmp(const wchar_t*, const wchar_t*, size_t);
extern "C" size_t wcsxfrm(wchar_t*, const wchar_t*, size_t); extern "C" size_t wcsxfrm(wchar_t*, const wchar_t*, size_t);
extern "C" wchar_t* wcschr(const wchar_t*, wchar_t); extern "C" const wchar_t* wcschr(const wchar_t*, wchar_t);
inline wchar_t*
wcschr(wchar_t* __p, wchar_t __c)
{
return const_cast<wchar_t*>(wcschr(const_cast<const wchar_t*>(__p), __c));
}
extern "C" size_t wcscspn(const wchar_t*, const wchar_t*); extern "C" size_t wcscspn(const wchar_t*, const wchar_t*);
extern "C" size_t wcslen(const wchar_t*); extern "C" size_t wcslen(const wchar_t*);
extern "C" wchar_t* wcspbrk(const wchar_t*, const wchar_t*); extern "C" const wchar_t* wcspbrk(const wchar_t*, const wchar_t*);
extern "C" wchar_t* wcsrchr(const wchar_t*, wchar_t); inline wchar_t*
wcspbrk(wchar_t* __s1, wchar_t* __s2)
{
return const_cast<wchar_t*>(wcspbrk(const_cast<const wchar_t*>(__s1), __s2));
}
extern "C" const wchar_t* wcsrchr(const wchar_t*, wchar_t);
inline wchar_t*
wcsrchr(wchar_t* __p, wchar_t __c)
{
return const_cast<wchar_t*>(wcsrchr(const_cast<const wchar_t*>(__p), __c));
}
extern "C" size_t wcsspn(const wchar_t*, const wchar_t*); extern "C" size_t wcsspn(const wchar_t*, const wchar_t*);
extern "C" wchar_t* wcsstr(const wchar_t*, const wchar_t*); extern "C" const wchar_t* wcsstr(const wchar_t*, const wchar_t*);
inline wchar_t*
wcsstr(wchar_t* __s1, wchar_t* __s2)
{
return const_cast<wchar_t*>(wcsstr(const_cast<const wchar_t*>(__s1), __s2));
}
extern "C" wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**); extern "C" wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**);
extern "C" wchar_t* wmemchr(const wchar_t*, wchar_t, size_t); extern "C" const wchar_t* wmemchr(const wchar_t*, wchar_t, size_t);
inline wchar_t*
wmemchr(wchar_t* __p, wchar_t __c, size_t __n)
{
return const_cast<wchar_t*>(wmemchr(const_cast<const wchar_t*>(__p), __c, __n));
}
extern "C" int wmemcmp(const wchar_t*, const wchar_t*, size_t); extern "C" int wmemcmp(const wchar_t*, const wchar_t*, size_t);
//extern "C" int wmemcmp(wchar_t*, const wchar_t*, size_t); //extern "C" int wmemcmp(wchar_t*, const wchar_t*, size_t);
extern "C" wchar_t* wmemcpy(wchar_t*, const wchar_t*, size_t); extern "C" wchar_t* wmemcpy(wchar_t*, const wchar_t*, size_t);