diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-01-14 18:15:37 +0000 |
---|---|---|
committer | Paolo Carlini <paolo.carlini@oracle.com> | 2010-01-14 18:15:37 +0000 |
commit | 94d5a96f635dd311c9f202cbf70b37a9f562dee5 (patch) | |
tree | b3af2f72eff5500f34a3a0a7f36f5e47fcedf8bd /libstdc++-v3/include/c_std | |
parent | 68bd3229e2b7c18bb622c7998ec1a928f79988ba (diff) |
2010-01-14 Paolo Carlini <paolo.carlini@oracle.com>
* include/c_std/cstring (memchr): Forward to the builtin.
* include/c_std/cstring: Remove redundant casts; use names consistent
with the letter of the Standard.
* include/c_global/cstring: Likewise.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@155912 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/c_std')
-rw-r--r-- | libstdc++-v3/include/c_std/cstring | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libstdc++-v3/include/c_std/cstring b/libstdc++-v3/include/c_std/cstring index 63afe8c6a08..3535a249b3b 100644 --- a/libstdc++-v3/include/c_std/cstring +++ b/libstdc++-v3/include/c_std/cstring @@ -1,6 +1,7 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +// 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -97,24 +98,24 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #ifndef __CORRECT_ISO_CPP_STRING_H_PROTO inline void* - memchr(void* __p, int __c, size_t __n) - { return memchr(const_cast<const void*>(__p), __c, __n); } + memchr(void* __s, int __c, size_t __n) + { return __builtin_memchr(__s, __c, __n); } inline char* - strchr(char* __s1, int __n) - { return __builtin_strchr(const_cast<const char*>(__s1), __n); } + strchr(char* __s, int __n) + { return __builtin_strchr(__s, __n); } inline char* strpbrk(char* __s1, const char* __s2) - { return __builtin_strpbrk(const_cast<const char*>(__s1), __s2); } + { return __builtin_strpbrk(__s1, __s2); } inline char* - strrchr(char* __s1, int __n) - { return __builtin_strrchr(const_cast<const char*>(__s1), __n); } + strrchr(char* __s, int __n) + { return __builtin_strrchr(__s, __n); } inline char* strstr(char* __s1, const char* __s2) - { return __builtin_strstr(const_cast<const char*>(__s1), __s2); } + { return __builtin_strstr(__s1, __s2); } #endif _GLIBCXX_END_NAMESPACE |