Remove libstdc++ include files.
We still need <new> for bionic, and to build libstdc++.
Change-Id: Ic7b26340576a5355007a06db9c1bec395be49ae1
diff --git a/libstdc++/include/new b/libstdc++/include/new
index c5a43de..cffab6e 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 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();
+void* operator new[](std::size_t);
+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();
+
+// 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++