From 74ff6746d1bda719760b97a1780ce61b2f5a837a Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 7 Jul 2010 12:53:45 -0700 Subject: [PATCH] Remove C++ headers from the platform directories. We now rely instead on the content of $NDK/sources/cxx-stl/system/include that is automatically used if a module has C++ sources. Change-Id: I4319d9260fcf9fb31c59c2f21ca64b536725d4f5 --- .../android-3/arch-arm/usr/include/cstddef | 0 .../android-3/arch-arm/usr/include/new | 29 ----- .../android-3/arch-arm/usr/include/stl_pair.h | 122 ------------------ .../android-3/arch-arm/usr/include/typeinfo | 28 ---- .../android-3/arch-arm/usr/include/utility | 38 ------ .../android-4/arch-arm/usr/include/cstddef | 0 .../android-4/arch-arm/usr/include/new | 29 ----- .../android-4/arch-arm/usr/include/stl_pair.h | 122 ------------------ .../android-4/arch-arm/usr/include/typeinfo | 28 ---- .../android-4/arch-arm/usr/include/utility | 38 ------ .../android-5/arch-arm/usr/include/cstddef | 0 .../android-5/arch-arm/usr/include/new | 29 ----- .../android-5/arch-arm/usr/include/stl_pair.h | 122 ------------------ .../android-5/arch-arm/usr/include/typeinfo | 28 ---- .../android-5/arch-arm/usr/include/utility | 38 ------ .../android-5/arch-x86/usr/include/cstddef | 46 ------- .../android-5/arch-x86/usr/include/new | 28 ---- .../android-5/arch-x86/usr/include/stl_pair.h | 122 ------------------ .../android-5/arch-x86/usr/include/typeinfo | 28 ---- .../android-5/arch-x86/usr/include/utility | 38 ------ .../android-8/arch-arm/usr/include/cstddef | 0 .../android-8/arch-arm/usr/include/new | 29 ----- .../android-8/arch-arm/usr/include/stl_pair.h | 122 ------------------ .../android-8/arch-arm/usr/include/typeinfo | 28 ---- .../android-8/arch-arm/usr/include/utility | 38 ------ .../android-8/arch-x86/usr/include/cstddef | 46 ------- .../android-8/arch-x86/usr/include/new | 28 ---- .../android-8/arch-x86/usr/include/stl_pair.h | 122 ------------------ .../android-8/arch-x86/usr/include/typeinfo | 28 ---- .../android-8/arch-x86/usr/include/utility | 38 ------ .../android-9/arch-arm/usr/include/cstddef | 0 .../android-9/arch-arm/usr/include/new | 29 ----- .../android-9/arch-arm/usr/include/stl_pair.h | 122 ------------------ .../android-9/arch-arm/usr/include/typeinfo | 28 ---- .../android-9/arch-arm/usr/include/utility | 38 ------ .../android-9/arch-x86/usr/include/cstddef | 46 ------- .../android-9/arch-x86/usr/include/new | 28 ---- .../android-9/arch-x86/usr/include/stl_pair.h | 122 ------------------ .../android-9/arch-x86/usr/include/typeinfo | 28 ---- .../android-9/arch-x86/usr/include/utility | 38 ------ 40 files changed, 1871 deletions(-) delete mode 100644 ndk/platforms/android-3/arch-arm/usr/include/cstddef delete mode 100644 ndk/platforms/android-3/arch-arm/usr/include/new delete mode 100644 ndk/platforms/android-3/arch-arm/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-3/arch-arm/usr/include/typeinfo delete mode 100644 ndk/platforms/android-3/arch-arm/usr/include/utility delete mode 100644 ndk/platforms/android-4/arch-arm/usr/include/cstddef delete mode 100644 ndk/platforms/android-4/arch-arm/usr/include/new delete mode 100644 ndk/platforms/android-4/arch-arm/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-4/arch-arm/usr/include/typeinfo delete mode 100644 ndk/platforms/android-4/arch-arm/usr/include/utility delete mode 100644 ndk/platforms/android-5/arch-arm/usr/include/cstddef delete mode 100644 ndk/platforms/android-5/arch-arm/usr/include/new delete mode 100644 ndk/platforms/android-5/arch-arm/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-5/arch-arm/usr/include/typeinfo delete mode 100644 ndk/platforms/android-5/arch-arm/usr/include/utility delete mode 100644 ndk/platforms/android-5/arch-x86/usr/include/cstddef delete mode 100644 ndk/platforms/android-5/arch-x86/usr/include/new delete mode 100644 ndk/platforms/android-5/arch-x86/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-5/arch-x86/usr/include/typeinfo delete mode 100644 ndk/platforms/android-5/arch-x86/usr/include/utility delete mode 100644 ndk/platforms/android-8/arch-arm/usr/include/cstddef delete mode 100644 ndk/platforms/android-8/arch-arm/usr/include/new delete mode 100644 ndk/platforms/android-8/arch-arm/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-8/arch-arm/usr/include/typeinfo delete mode 100644 ndk/platforms/android-8/arch-arm/usr/include/utility delete mode 100644 ndk/platforms/android-8/arch-x86/usr/include/cstddef delete mode 100644 ndk/platforms/android-8/arch-x86/usr/include/new delete mode 100644 ndk/platforms/android-8/arch-x86/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-8/arch-x86/usr/include/typeinfo delete mode 100644 ndk/platforms/android-8/arch-x86/usr/include/utility delete mode 100644 ndk/platforms/android-9/arch-arm/usr/include/cstddef delete mode 100644 ndk/platforms/android-9/arch-arm/usr/include/new delete mode 100644 ndk/platforms/android-9/arch-arm/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-9/arch-arm/usr/include/typeinfo delete mode 100644 ndk/platforms/android-9/arch-arm/usr/include/utility delete mode 100644 ndk/platforms/android-9/arch-x86/usr/include/cstddef delete mode 100644 ndk/platforms/android-9/arch-x86/usr/include/new delete mode 100644 ndk/platforms/android-9/arch-x86/usr/include/stl_pair.h delete mode 100644 ndk/platforms/android-9/arch-x86/usr/include/typeinfo delete mode 100644 ndk/platforms/android-9/arch-x86/usr/include/utility diff --git a/ndk/platforms/android-3/arch-arm/usr/include/cstddef b/ndk/platforms/android-3/arch-arm/usr/include/cstddef deleted file mode 100644 index e69de29bb..000000000 diff --git a/ndk/platforms/android-3/arch-arm/usr/include/new b/ndk/platforms/android-3/arch-arm/usr/include/new deleted file mode 100644 index 559308b68..000000000 --- a/ndk/platforms/android-3/arch-arm/usr/include/new +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - 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*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-3/arch-arm/usr/include/stl_pair.h b/ndk/platforms/android-3/arch-arm/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-3/arch-arm/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-3/arch-arm/usr/include/typeinfo b/ndk/platforms/android-3/arch-arm/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-3/arch-arm/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-3/arch-arm/usr/include/utility b/ndk/platforms/android-3/arch-arm/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-3/arch-arm/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-4/arch-arm/usr/include/cstddef b/ndk/platforms/android-4/arch-arm/usr/include/cstddef deleted file mode 100644 index e69de29bb..000000000 diff --git a/ndk/platforms/android-4/arch-arm/usr/include/new b/ndk/platforms/android-4/arch-arm/usr/include/new deleted file mode 100644 index 559308b68..000000000 --- a/ndk/platforms/android-4/arch-arm/usr/include/new +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - 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*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-4/arch-arm/usr/include/stl_pair.h b/ndk/platforms/android-4/arch-arm/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-4/arch-arm/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-4/arch-arm/usr/include/typeinfo b/ndk/platforms/android-4/arch-arm/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-4/arch-arm/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-4/arch-arm/usr/include/utility b/ndk/platforms/android-4/arch-arm/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-4/arch-arm/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-5/arch-arm/usr/include/cstddef b/ndk/platforms/android-5/arch-arm/usr/include/cstddef deleted file mode 100644 index e69de29bb..000000000 diff --git a/ndk/platforms/android-5/arch-arm/usr/include/new b/ndk/platforms/android-5/arch-arm/usr/include/new deleted file mode 100644 index 559308b68..000000000 --- a/ndk/platforms/android-5/arch-arm/usr/include/new +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - 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*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-5/arch-arm/usr/include/stl_pair.h b/ndk/platforms/android-5/arch-arm/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-5/arch-arm/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-5/arch-arm/usr/include/typeinfo b/ndk/platforms/android-5/arch-arm/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-5/arch-arm/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-5/arch-arm/usr/include/utility b/ndk/platforms/android-5/arch-arm/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-5/arch-arm/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-5/arch-x86/usr/include/cstddef b/ndk/platforms/android-5/arch-x86/usr/include/cstddef deleted file mode 100644 index fc1ca9d6b..000000000 --- a/ndk/platforms/android-5/arch-x86/usr/include/cstddef +++ /dev/null @@ -1,46 +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 - -namespace std { -using ::ptrdiff_t; -using ::size_t; -} // namespace std - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__ diff --git a/ndk/platforms/android-5/arch-x86/usr/include/new b/ndk/platforms/android-5/arch-x86/usr/include/new deleted file mode 100644 index 19d818535..000000000 --- a/ndk/platforms/android-5/arch-x86/usr/include/new +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- c++ -*- */ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - struct nothrow_t {}; - extern const nothrow_t nothrow; -} - -void* operator new(std::size_t); -void* operator new[](std::size_t); -void operator delete(void*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-5/arch-x86/usr/include/stl_pair.h b/ndk/platforms/android-5/arch-x86/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-5/arch-x86/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-5/arch-x86/usr/include/typeinfo b/ndk/platforms/android-5/arch-x86/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-5/arch-x86/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-5/arch-x86/usr/include/utility b/ndk/platforms/android-5/arch-x86/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-5/arch-x86/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-8/arch-arm/usr/include/cstddef b/ndk/platforms/android-8/arch-arm/usr/include/cstddef deleted file mode 100644 index e69de29bb..000000000 diff --git a/ndk/platforms/android-8/arch-arm/usr/include/new b/ndk/platforms/android-8/arch-arm/usr/include/new deleted file mode 100644 index 559308b68..000000000 --- a/ndk/platforms/android-8/arch-arm/usr/include/new +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - 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*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-8/arch-arm/usr/include/stl_pair.h b/ndk/platforms/android-8/arch-arm/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-8/arch-arm/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-8/arch-arm/usr/include/typeinfo b/ndk/platforms/android-8/arch-arm/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-8/arch-arm/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-8/arch-arm/usr/include/utility b/ndk/platforms/android-8/arch-arm/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-8/arch-arm/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-8/arch-x86/usr/include/cstddef b/ndk/platforms/android-8/arch-x86/usr/include/cstddef deleted file mode 100644 index fc1ca9d6b..000000000 --- a/ndk/platforms/android-8/arch-x86/usr/include/cstddef +++ /dev/null @@ -1,46 +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 - -namespace std { -using ::ptrdiff_t; -using ::size_t; -} // namespace std - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__ diff --git a/ndk/platforms/android-8/arch-x86/usr/include/new b/ndk/platforms/android-8/arch-x86/usr/include/new deleted file mode 100644 index 19d818535..000000000 --- a/ndk/platforms/android-8/arch-x86/usr/include/new +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- c++ -*- */ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - struct nothrow_t {}; - extern const nothrow_t nothrow; -} - -void* operator new(std::size_t); -void* operator new[](std::size_t); -void operator delete(void*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-8/arch-x86/usr/include/stl_pair.h b/ndk/platforms/android-8/arch-x86/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-8/arch-x86/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-8/arch-x86/usr/include/typeinfo b/ndk/platforms/android-8/arch-x86/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-8/arch-x86/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-8/arch-x86/usr/include/utility b/ndk/platforms/android-8/arch-x86/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-8/arch-x86/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-9/arch-arm/usr/include/cstddef b/ndk/platforms/android-9/arch-arm/usr/include/cstddef deleted file mode 100644 index e69de29bb..000000000 diff --git a/ndk/platforms/android-9/arch-arm/usr/include/new b/ndk/platforms/android-9/arch-arm/usr/include/new deleted file mode 100644 index 559308b68..000000000 --- a/ndk/platforms/android-9/arch-arm/usr/include/new +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - 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*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-9/arch-arm/usr/include/stl_pair.h b/ndk/platforms/android-9/arch-arm/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-9/arch-arm/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-9/arch-arm/usr/include/typeinfo b/ndk/platforms/android-9/arch-arm/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-9/arch-arm/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-9/arch-arm/usr/include/utility b/ndk/platforms/android-9/arch-arm/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-9/arch-arm/usr/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 - -#endif /* _CPP_UTILITY */ diff --git a/ndk/platforms/android-9/arch-x86/usr/include/cstddef b/ndk/platforms/android-9/arch-x86/usr/include/cstddef deleted file mode 100644 index fc1ca9d6b..000000000 --- a/ndk/platforms/android-9/arch-x86/usr/include/cstddef +++ /dev/null @@ -1,46 +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 - -namespace std { -using ::ptrdiff_t; -using ::size_t; -} // namespace std - -#endif // BIONIC_LIBSTDCPP_INCLUDE_CSTDDEF__ diff --git a/ndk/platforms/android-9/arch-x86/usr/include/new b/ndk/platforms/android-9/arch-x86/usr/include/new deleted file mode 100644 index 19d818535..000000000 --- a/ndk/platforms/android-9/arch-x86/usr/include/new +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- c++ -*- */ -#ifndef __NEW__ -#define __NEW__ - -#include - -namespace std { - struct nothrow_t {}; - extern const nothrow_t nothrow; -} - -void* operator new(std::size_t); -void* operator new[](std::size_t); -void operator delete(void*); -void operator delete[](void*); -void* operator new(std::size_t, const std::nothrow_t&); -void* operator new[](std::size_t, const std::nothrow_t&); -void operator delete(void*, const std::nothrow_t&); -void operator delete[](void*, const std::nothrow_t&); - -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*) { } -inline void operator delete[](void*, void*) { } - -#endif // __NEW__ diff --git a/ndk/platforms/android-9/arch-x86/usr/include/stl_pair.h b/ndk/platforms/android-9/arch-x86/usr/include/stl_pair.h deleted file mode 100644 index 37f757bb7..000000000 --- a/ndk/platforms/android-9/arch-x86/usr/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 -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 - pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {} -}; - -template -inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) -{ - return __x.first == __y.first && __x.second == __y.second; -} - -template -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 -inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x == __y); -} - -template -inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return __y < __x; -} - -template -inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__y < __x); -} - -template -inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) { - return !(__x < __y); -} - -template -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/ndk/platforms/android-9/arch-x86/usr/include/typeinfo b/ndk/platforms/android-9/arch-x86/usr/include/typeinfo deleted file mode 100644 index 8a51a548c..000000000 --- a/ndk/platforms/android-9/arch-x86/usr/include/typeinfo +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _TYPEINFO_HEADER_GAURD -#define _TYPEINFO_HEADER_GAURD - - -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); -}; - -#endif diff --git a/ndk/platforms/android-9/arch-x86/usr/include/utility b/ndk/platforms/android-9/arch-x86/usr/include/utility deleted file mode 100644 index 12044a781..000000000 --- a/ndk/platforms/android-9/arch-x86/usr/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 - -#endif /* _CPP_UTILITY */