diff options
Diffstat (limited to 'libstdc++-v3/shadow/bits/std_cstring.h')
| -rw-r--r-- | libstdc++-v3/shadow/bits/std_cstring.h | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/libstdc++-v3/shadow/bits/std_cstring.h b/libstdc++-v3/shadow/bits/std_cstring.h index cf526603a27..441afeca94a 100644 --- a/libstdc++-v3/shadow/bits/std_cstring.h +++ b/libstdc++-v3/shadow/bits/std_cstring.h @@ -40,9 +40,9 @@ # include <bits/std_cstddef.h> /* pick up size_t, NULL */ - namespace _C_Swamp { + namespace _C_legacy { extern "C" { -# define _IN_C_SWAMP_ +# define _IN_C_LEGACY_ # pragma system_header # include_next <string.h> } @@ -100,8 +100,8 @@ inline size_t _CPP_strlen_capture(char const* __s) { return strlen(__s); } - namespace _C_Shadow { } - } // close namespace ::_C_Swamp:: + namespace _C_shadow { } + } // close namespace ::_C_legacy:: // size_t, NULL # undef memcpy @@ -127,8 +127,8 @@ # undef strerror # undef strlen - namespace _C_Swamp { - namespace _C_Shadow { + namespace _C_legacy { + namespace _C_shadow { } } namespace std { @@ -137,75 +137,75 @@ // C++ definition differs from C in some cases. inline void* memcpy(void* __s1, void const* __s2, size_t __n) - { return ::_C_Swamp::_CPP_memcpy_capture(__s1,__s2,__n); } + { return ::_C_legacy::_CPP_memcpy_capture(__s1,__s2,__n); } inline void* memmove(void* __s1, void const* __s2, size_t __n) - { return ::_C_Swamp::_CPP_memmove_capture(__s1,__s2,__n); } + { return ::_C_legacy::_CPP_memmove_capture(__s1,__s2,__n); } inline void* strcpy(char* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strcpy_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strcpy_capture(__s1,__s2); } inline char* strncpy(char* __s1, char const* __s2, size_t __n) - { return ::_C_Swamp::_CPP_strncpy_capture(__s1,__s2,__n); } + { return ::_C_legacy::_CPP_strncpy_capture(__s1,__s2,__n); } inline char* strcat(char* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strcat_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strcat_capture(__s1,__s2); } inline char* strncat(char* __s1, char const* __s2, size_t __n) - { return ::_C_Swamp::_CPP_strncat_capture(__s1,__s2,__n); } + { return ::_C_legacy::_CPP_strncat_capture(__s1,__s2,__n); } inline int memcmp(void const* __s1, void const* __s2, size_t __n) - { return ::_C_Swamp::_CPP_memcmp_capture(__s1,__s2,__n); } + { return ::_C_legacy::_CPP_memcmp_capture(__s1,__s2,__n); } inline int strcmp(char const* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strcmp_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strcmp_capture(__s1,__s2); } inline int strcoll(char const* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strcoll_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strcoll_capture(__s1,__s2); } inline int strncmp(char const* __s1, char const* __s2, size_t __n) - { return ::_C_Swamp::_CPP_strncmp_capture(__s1,__s2,__n); } + { return ::_C_legacy::_CPP_strncmp_capture(__s1,__s2,__n); } inline size_t strxfrm(char* __b, char const* __s, size_t __n) - { return ::_C_Swamp::_CPP_strxfrm_capture(__b,__s,__n); } + { return ::_C_legacy::_CPP_strxfrm_capture(__b,__s,__n); } inline void const* memchr(void const* __s1, int __c, size_t __n) - { return ::_C_Swamp::_CPP_memchr_capture(__s1,__c,__n); } + { return ::_C_legacy::_CPP_memchr_capture(__s1,__c,__n); } inline void* memchr( void* __s1, int __c, size_t __n) - { return ::_C_Swamp::_CPP_memchr_capture(__s1,__c,__n); } + { return ::_C_legacy::_CPP_memchr_capture(__s1,__c,__n); } inline char const* strchr(char const* __s1, int __c) - { return ::_C_Swamp::_CPP_strchr_capture(__s1,__c); } + { return ::_C_legacy::_CPP_strchr_capture(__s1,__c); } inline char* strchr( char* __s1, int __c) - { return ::_C_Swamp::_CPP_strchr_capture(__s1,__c); } + { return ::_C_legacy::_CPP_strchr_capture(__s1,__c); } inline size_t strcspn(char const* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strcspn_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strcspn_capture(__s1,__s2); } inline char const* strpbrk(char const* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strpbrk_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strpbrk_capture(__s1,__s2); } inline char* strpbrk( char* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strpbrk_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strpbrk_capture(__s1,__s2); } inline char const* strrchr(char const* __s1, int __c) - { return ::_C_Swamp::_CPP_strrchr_capture(__s1,__c); } + { return ::_C_legacy::_CPP_strrchr_capture(__s1,__c); } inline char* strrchr( char* __s1, int __c) - { return ::_C_Swamp::_CPP_strrchr_capture(__s1,__c); } + { return ::_C_legacy::_CPP_strrchr_capture(__s1,__c); } inline size_t strspn(char const* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strspn_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strspn_capture(__s1,__s2); } inline char const* strstr(char const* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strstr_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strstr_capture(__s1,__s2); } inline char* strstr( char* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strstr_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strstr_capture(__s1,__s2); } inline char* strtok(char* __s1, char const* __s2) - { return ::_C_Swamp::_CPP_strtok_capture(__s1,__s2); } + { return ::_C_legacy::_CPP_strtok_capture(__s1,__s2); } inline void* memset(void* __s, int __c, size_t __n) - { return ::_C_Swamp::_CPP_memset_capture(__s,__c,__n); } + { return ::_C_legacy::_CPP_memset_capture(__s,__c,__n); } - using ::_C_Swamp::strerror; + using ::_C_legacy::strerror; inline size_t strlen(char const* __s) - { return ::_C_Swamp::_CPP_strlen_capture(__s); } + { return ::_C_legacy::_CPP_strlen_capture(__s); } } // close namespace std:: - namespace _C_Swamp { - namespace _C_Shadow { + namespace _C_legacy { + namespace _C_shadow { // adopt names back into C using ::std::memcpy; using ::std::memmove; @@ -232,7 +232,7 @@ } } -# undef _IN_C_SWAMP_ +# undef _IN_C_LEGACY_ #endif |