From 69b1a8ac50adbd74c45c3d4d07384e9107a4d12d Mon Sep 17 00:00:00 2001 From: Niko Catania <> Date: Fri, 10 Apr 2009 10:54:03 -0700 Subject: [PATCH] AI 145716: am: CL 145714 Added cstring wrapper around string.h. In new, include cstddef which declares std::size_t. Original author: niko Automated import of CL 145716 --- libstdc++/include/cstring | 97 ++++++++++++++++++++++ libstdc++/include/cwchar_is_not_supported | 31 +++++++ libstdc++/include/cwctype_is_not_supported | 31 +++++++ libstdc++/include/new | 5 +- 4 files changed, 161 insertions(+), 3 deletions(-) create mode 100644 libstdc++/include/cstring create mode 100644 libstdc++/include/cwchar_is_not_supported create mode 100644 libstdc++/include/cwctype_is_not_supported diff --git a/libstdc++/include/cstring b/libstdc++/include/cstring new file mode 100644 index 000000000..4ff7a6f10 --- /dev/null +++ b/libstdc++/include/cstring @@ -0,0 +1,97 @@ +/* -*- c++ -*- */ +/* + * Copyright (C) 2009 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef BIONIC_LIBSTDCPP_INCLUDE_CSTRING__ +#define BIONIC_LIBSTDCPP_INCLUDE_CSTRING__ + +/* + * Standard C++ Library wrapper around the C string.h header file. + */ + +#include +#include + +namespace std +{ +using ::memccpy; +using ::memchr; +using ::memrchr; +using ::memcmp; +using ::memcpy; +using ::memmove; +using ::memset; +using ::memmem; +// In string.h but not part of the std +// using ::memswap; + +using ::index; +using ::rindex; +using ::strchr; +using ::strrchr; + +using ::strlen; +using ::strcmp; +using ::strcpy; +using ::strcat; + +using ::strcasecmp; +using ::strncasecmp; +using ::strdup; + +using ::strstr; +using ::strcasestr; +using ::strtok; +using ::strtok_r; + +using ::strerror; +using ::strerror_r; + +using ::strnlen; +using ::strncat; +using ::strndup; +using ::strncmp; +using ::strncpy; + +// In string.h but not part of the std +// using ::strlcat; +// using ::strlcpy; + +using ::strcspn; +using ::strpbrk; +using ::strsep; +using ::strspn; + +using ::strsignal; + +using ::strcoll; +using ::strxfrm; + +} // namespace std + +#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTRING__ diff --git a/libstdc++/include/cwchar_is_not_supported b/libstdc++/include/cwchar_is_not_supported new file mode 100644 index 000000000..a4f9f426b --- /dev/null +++ b/libstdc++/include/cwchar_is_not_supported @@ -0,0 +1,31 @@ +/* -*- c++ -*- */ +/* + * Copyright (C) 2009 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* IMPORTANT: cwchar and cwctype are not supported. See comment in + * bionic/libc/include/wchar.h */ diff --git a/libstdc++/include/cwctype_is_not_supported b/libstdc++/include/cwctype_is_not_supported new file mode 100644 index 000000000..a4f9f426b --- /dev/null +++ b/libstdc++/include/cwctype_is_not_supported @@ -0,0 +1,31 @@ +/* -*- c++ -*- */ +/* + * Copyright (C) 2009 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* IMPORTANT: cwchar and cwctype are not supported. See comment in + * bionic/libc/include/wchar.h */ diff --git a/libstdc++/include/new b/libstdc++/include/new index 559308b68..19d818535 100644 --- a/libstdc++/include/new +++ b/libstdc++/include/new @@ -1,11 +1,10 @@ +/* -*- c++ -*- */ #ifndef __NEW__ #define __NEW__ -#include +#include namespace std { - using ::size_t; - struct nothrow_t {}; extern const nothrow_t nothrow; }