diff options
author | Elliott Hughes <enh@google.com> | 2016-05-26 17:35:00 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2016-05-27 15:49:31 -0700 |
commit | f44b232d85e9d8be6242251d570742d49a7066db (patch) | |
tree | 1815588b5a604e10ecffeef11c6299efb830c863 /libstdc++ | |
parent | a3c2df93789bb7536bd96a01bbf952b6fcee269b (diff) | |
download | bionic-f44b232d85e9d8be6242251d570742d49a7066db.tar.gz |
Remove libstdc++ include files.
We still need <new> for bionic, and to build libstdc++.
Change-Id: Ic7b26340576a5355007a06db9c1bec395be49ae1
Diffstat (limited to 'libstdc++')
-rw-r--r-- | libstdc++/include/cassert | 39 | ||||
-rw-r--r-- | libstdc++/include/cctype | 60 | ||||
-rw-r--r-- | libstdc++/include/cerrno | 40 | ||||
-rw-r--r-- | libstdc++/include/cfloat | 39 | ||||
-rw-r--r-- | libstdc++/include/climits | 39 | ||||
-rw-r--r-- | libstdc++/include/cmath | 75 | ||||
-rw-r--r-- | libstdc++/include/csetjmp | 53 | ||||
-rw-r--r-- | libstdc++/include/csignal | 50 | ||||
-rw-r--r-- | libstdc++/include/cstddef | 50 | ||||
-rw-r--r-- | libstdc++/include/cstdint | 40 | ||||
-rw-r--r-- | libstdc++/include/cstdio | 98 | ||||
-rw-r--r-- | libstdc++/include/cstdlib | 116 | ||||
-rw-r--r-- | libstdc++/include/cstring | 70 | ||||
-rw-r--r-- | libstdc++/include/ctime | 63 | ||||
-rw-r--r-- | libstdc++/include/cwchar | 31 | ||||
-rw-r--r-- | libstdc++/include/cwctype_is_not_supported | 31 | ||||
-rw-r--r-- | libstdc++/include/new | 27 | ||||
-rw-r--r-- | libstdc++/include/stl_pair.h | 122 | ||||
-rw-r--r-- | libstdc++/include/typeinfo | 31 | ||||
-rw-r--r-- | libstdc++/include/utility | 38 |
20 files changed, 15 insertions, 1097 deletions
diff --git a/libstdc++/include/cassert b/libstdc++/include/cassert deleted file mode 100644 index 5753e3404..000000000 --- a/libstdc++/include/cassert +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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. - */ - -/* - * Standard C++ Library wrapper around the C assert.h header file. This file - * can be included multiple times with different definition of NDEBUG, hence the - * absence of include guards. - */ - -#ifndef BIONIC_LIBSTDCPP_INCLUDE_CASSERT__ -#define BIONIC_LIBSTDCPP_INCLUDE_CASSERT__ -#endif -#include <assert.h> diff --git a/libstdc++/include/cctype b/libstdc++/include/cctype deleted file mode 100644 index e0eb98128..000000000 --- a/libstdc++/include/cctype +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- 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_CCTYPE__ -#define BIONIC_LIBSTDCPP_INCLUDE_CCTYPE__ - -/* - * Standard C++ Library wrapper around the C ctype.h header file. - */ - -#include <ctype.h> - -extern "C++" { - -namespace std -{ -using ::isalnum; -using ::isalpha; -using ::iscntrl; -using ::isdigit; -using ::isgraph; -using ::islower; -using ::isprint; -using ::ispunct; -using ::isspace; -using ::isupper; -using ::isxdigit; -using ::tolower; -using ::toupper; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CCTYPE__ diff --git a/libstdc++/include/cerrno b/libstdc++/include/cerrno deleted file mode 100644 index e53ca2571..000000000 --- a/libstdc++/include/cerrno +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- 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_CERRNO__ -#define BIONIC_LIBSTDCPP_INCLUDE_CERRNO__ - -/* - * Standard C++ Library wrapper around the C errno.h header file. - */ -#include <errno.h> - -// errno is a macro, so we can't define std::errno - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CERRNO__ diff --git a/libstdc++/include/cfloat b/libstdc++/include/cfloat deleted file mode 100644 index 21c01d9c9..000000000 --- a/libstdc++/include/cfloat +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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_CFLOAT__ -#define BIONIC_LIBSTDCPP_INCLUDE_CFLOAT__ - -/* - * Standard C++ Library wrapper around the C float.h header file. - */ -#include <sys/limits.h> -#include <float.h> - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CFLOAT__ diff --git a/libstdc++/include/climits b/libstdc++/include/climits deleted file mode 100644 index df85cb93d..000000000 --- a/libstdc++/include/climits +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- 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_CLIMITS__ -#define BIONIC_LIBSTDCPP_INCLUDE_CLIMITS__ - -/* - * Standard C++ Library wrapper around the C limits.h header file. - */ - -#include <limits.h> - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CLIMITS__ diff --git a/libstdc++/include/cmath b/libstdc++/include/cmath deleted file mode 100644 index a15b2acfc..000000000 --- a/libstdc++/include/cmath +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- 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_CMATH__ -#define BIONIC_LIBSTDCPP_INCLUDE_CMATH__ - -/* - * Standard C++ Library wrapper around the C math.h header file. - */ - -#include <cstddef> -#include <math.h> - -extern "C++" { - -namespace std -{ -// Functions. -using ::cos; -using ::sin; -using ::tan; -using ::acos; -using ::asin; -using ::atan; -using ::atan2; - -using ::cosh; -using ::sinh; -using ::tanh; - -using ::exp; -using ::frexp; -using ::ldexp; -using ::log; -using ::log10; -using ::modf; - -using ::pow; -using ::sqrt; - -using ::ceil; -using ::fabs; -using ::floor; -using ::fmod; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CMATH__ diff --git a/libstdc++/include/csetjmp b/libstdc++/include/csetjmp deleted file mode 100644 index ba82144c3..000000000 --- a/libstdc++/include/csetjmp +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- 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_CSETJMP__ -#define BIONIC_LIBSTDCPP_INCLUDE_CSETJMP__ - -/* - * Standard C++ Library wrapper around the C setjmp.h header file. - */ - -#include <setjmp.h> - -extern "C++" { - -#ifndef setjmp -#define setjmp(env) setjmp (env) -#endif - -namespace std -{ -using ::jmp_buf; -using ::longjmp; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSETJMP__ diff --git a/libstdc++/include/csignal b/libstdc++/include/csignal deleted file mode 100644 index 84f0e1d02..000000000 --- a/libstdc++/include/csignal +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- 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_CSIGNAL__ -#define BIONIC_LIBSTDCPP_INCLUDE_CSIGNAL__ - -/* - * Standard C++ Library wrapper around the C signal.h header file. - */ - -#include <signal.h> - -extern "C++" { - -namespace std -{ -using ::sig_atomic_t; -using ::signal; -using ::raise; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSIGNAL__ diff --git a/libstdc++/include/cstddef b/libstdc++/include/cstddef deleted file mode 100644 index cb06b49c8..000000000 --- a/libstdc++/include/cstddef +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- 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_CSTDDEF__ -#define BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__ - -/* - * Standard C++ Library wrapper around the C stddef.h header file. - * The following 2 types are also declared in the 'std' namespace: - * . ptrdiff_t - * . size_t - */ -#include <stddef.h> - -extern "C++" { - -namespace std { -using ::ptrdiff_t; -using ::size_t; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__ diff --git a/libstdc++/include/cstdint b/libstdc++/include/cstdint deleted file mode 100644 index 3df56df0a..000000000 --- a/libstdc++/include/cstdint +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- 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_CSTDINT__ -#define BIONIC_LIBSTDCPP_INCLUDE_CSTDINT__ - -/* - * Standard C++ Library wrapper around the C stdint.h header file. - */ - -#include <stdint.h> - - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDINT__ diff --git a/libstdc++/include/cstdio b/libstdc++/include/cstdio deleted file mode 100644 index 2948d852a..000000000 --- a/libstdc++/include/cstdio +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- 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_CSTDIO__ -#define BIONIC_LIBSTDCPP_INCLUDE_CSTDIO__ - -/* - * Standard C++ Library wrapper around the C stdio.h header file. - */ -#include <cstddef> -#include <stdio.h> - -extern "C++" { - -namespace std { -using ::FILE; -using ::fpos_t; - -using ::clearerr; -using ::fclose; -using ::feof; -using ::ferror; -using ::fflush; -using ::fgetc; -using ::fgetpos; -using ::fgets; -using ::fopen; -using ::fprintf; -using ::fputc; -using ::fputs; -using ::fread; -using ::freopen; -using ::fscanf; -using ::fseek; -using ::fsetpos; -using ::ftell; -using ::fwrite; -using ::getc; -using ::getchar; -#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L -using ::gets; -#endif -using ::perror; -using ::printf; -using ::putc; -using ::putchar; -using ::puts; -using ::remove; -using ::rename; -using ::rewind; -using ::scanf; -using ::setbuf; -using ::setvbuf; -using ::sprintf; -using ::sscanf; -using ::tmpfile; -using ::tmpnam; -using ::ungetc; -using ::vfprintf; -using ::vprintf; -using ::vsprintf; - -using ::snprintf; -using ::vfscanf; -using ::vscanf; -using ::vsnprintf; -using ::vsscanf; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDIO__ diff --git a/libstdc++/include/cstdlib b/libstdc++/include/cstdlib deleted file mode 100644 index bd1deae6e..000000000 --- a/libstdc++/include/cstdlib +++ /dev/null @@ -1,116 +0,0 @@ -/* -*- 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_CSTDLIB__ -#define BIONIC_LIBSTDCPP_INCLUDE_CSTDLIB__ - -/* - * Standard C++ Library wrapper around the C stdlib.h header file. - */ -#include <stdlib.h> - -extern "C++" { - -namespace std { - -using ::exit; -using ::abort; -using ::atexit; - -using ::getenv; -using ::putenv; -using ::setenv; -using ::unsetenv; -using ::clearenv; - -using ::mktemp; -using ::mkstemp; - -using ::strtol; -using ::strtoll; -using ::strtoul; -using ::strtoull; -using ::strtod; -using ::strtof; - -using ::atoi; -using ::atol; -using ::atoll; -using ::atof; - -using ::abs; -using ::labs; -using ::llabs; - -using ::realpath; -using ::system; - -using ::bsearch; -using ::qsort; - -using ::jrand48; -using ::mrand48; -using ::nrand48; -using ::lrand48; -using ::seed48; -using ::srand48; - -using ::rand; -using ::srand; -using ::random; -using ::srandom; - -using ::malloc; -using ::free; -using ::calloc; -using ::realloc; - -using ::unlockpt; -using ::ptsname; -using ::ptsname_r; -using ::getpt; -using ::grantpt; - -using ::div_t; -using ::div; -using ::ldiv_t; -using ::ldiv; -using ::lldiv_t; -using ::lldiv; - -using ::mblen; -using ::mbstowcs; -using ::mbtowc; -using ::wctomb; -using ::wcstombs; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDLIB__ diff --git a/libstdc++/include/cstring b/libstdc++/include/cstring deleted file mode 100644 index d3d9387e3..000000000 --- a/libstdc++/include/cstring +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- 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 <cstddef> -#include <string.h> - -extern "C++" { - -namespace std -{ -using ::memchr; -using ::memcmp; -using ::memcpy; -using ::memmove; -using ::memset; -using ::strcat; -using ::strchr; -using ::strcmp; -using ::strcoll; -using ::strcpy; -using ::strcspn; -using ::strerror; -using ::strlen; -using ::strncat; -using ::strncmp; -using ::strncpy; -using ::strpbrk; -using ::strrchr; -using ::strspn; -using ::strstr; -using ::strtok; -using ::strxfrm; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTRING__ diff --git a/libstdc++/include/ctime b/libstdc++/include/ctime deleted file mode 100644 index 9e6744fe4..000000000 --- a/libstdc++/include/ctime +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- 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_CTIME__ -#define BIONIC_LIBSTDCPP_INCLUDE_CTIME__ - -/* - * Standard C++ Library wrapper around the C time.h header file. - */ - -#include <cstddef> -#include <time.h> - -extern "C++" { - -namespace std -{ -// Types. -using ::clock_t; -using ::time_t; -using ::tm; - -// Functions. -using ::clock; -using ::difftime; -using ::mktime; -using ::time; -using ::asctime; -using ::ctime; -using ::gmtime; -using ::localtime; -using ::strftime; -} // namespace std - -} // extern C++ - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CTIME__ diff --git a/libstdc++/include/cwchar b/libstdc++/include/cwchar deleted file mode 100644 index a4f9f426b..000000000 --- a/libstdc++/include/cwchar +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- 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 deleted file mode 100644 index a4f9f426b..000000000 --- a/libstdc++/include/cwctype_is_not_supported +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- 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 c5a43de43..cffab6e1c 100644 --- a/libstdc++/include/new +++ b/libstdc++/include/new @@ -2,30 +2,33 @@ #ifndef __NEW__ #define __NEW__ -#include <cstddef> +#include <stddef.h> extern "C++" { namespace std { - struct nothrow_t {}; - extern const nothrow_t nothrow; + using ::size_t; + struct nothrow_t {}; + extern const nothrow_t nothrow; } void* operator new(std::size_t); -void* operator new[](std::size_t); -void operator delete(void*) throw(); -void operator delete[](void*) throw(); void* operator new(std::size_t, const std::nothrow_t&); +void operator delete(void*) throw(); +// TODO: void operator delete(void*, std::size_t) throw(); +void operator delete(void*, const std::nothrow_t&) throw(); + +void* operator new[](std::size_t); void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&) throw(); -void operator delete[](void*, const std::nothrow_t&) throw(); +void operator delete[](void*) throw(); +// TODO: void operator delete[](void*, std::size_t) throw(); +void operator delete[](void*, const std::nothrow_t&) throw(); +// These four are not replaceable, so should be inlined. inline void* operator new(std::size_t, void* p) { return p; } inline void* operator new[](std::size_t, void* p) { return p; } - -// these next two are not really required, since exceptions are off -inline void operator delete(void*, void*) throw() { } -inline void operator delete[](void*, void*) throw() { } +inline void operator delete(void*, void*) throw() { } +inline void operator delete[](void*, void*) throw() { } } // extern C++ diff --git a/libstdc++/include/stl_pair.h b/libstdc++/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/libstdc++/include/stl_pair.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2008 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. - */ -/* - * - * Copyright (c) 1994 - * Hewlett-Packard Company - * - * Permission to use, copy, modify, distribute and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. Hewlett-Packard Company makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * - * Copyright (c) 1996,1997 - * Silicon Graphics Computer Systems, Inc. - * - * Permission to use, copy, modify, distribute and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. Silicon Graphics makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - */ - -/* NOTE: This is an internal header file, included by other STL headers. - * You should not attempt to use it directly. - */ - -#ifndef __SGI_STL_INTERNAL_PAIR_H -#define __SGI_STL_INTERNAL_PAIR_H - -__STL_BEGIN_NAMESPACE - -template <class _T1, class _T2> -struct pair { - typedef _T1 first_type; - typedef _T2 second_type; - - _T1 first; - _T2 second; - pair() : first(), second() {} - pair(const _T1& __a, const _T2& __b) : first(__a), second(__b) {} - - template <class _U1, class _U2> - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template <class _T1, class _T2> -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template <class _T1, class _T2> -inline bool operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first < __y.first || - (!(__y.first < __x.first) && __x.second < __y.second); -} - -template <class _T1, class _T2> -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template <class _T1, class _T2> -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template <class _T1, class _T2> -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template <class _T1, class _T2> -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template <class _T1, class _T2> -inline pair<_T1, _T2> make_pair(_T1 __x, _T2 __y) -{ - return pair<_T1, _T2>(__x, __y); -} - -__STL_END_NAMESPACE - -#endif /* __SGI_STL_INTERNAL_PAIR_H */ - -// Local Variables: -// mode:C++ -// End: diff --git a/libstdc++/include/typeinfo b/libstdc++/include/typeinfo deleted file mode 100644 index 4b48a7933..000000000 --- a/libstdc++/include/typeinfo +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - -extern "C++" { - -namespace std { - class type_info; - class bad_cast; - class bad_typeid; -}; - - -class type_info { -public: - type_info(); - virtual ~type_info(); - - char const * name() const; - - bool operator==(type_info const & right) const; - bool operator!=(type_info const & right) const; - bool before(type_info const & right) const; - -private: - type_info(type_info const & right); - type_info & operator=(type_info const & right); -}; - -} // C++ - -#endif diff --git a/libstdc++/include/utility b/libstdc++/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/libstdc++/include/utility +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008 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 _CPP_UTILITY -#define _CPP_UTILITY - -#pragma GCC system_header - -#define __STL_BEGIN_NAMESPACE namespace std { -#define __STL_END_NAMESPACE } - -#include <stl_pair.h> - -#endif /* _CPP_UTILITY */ |