- Added declaration and definition of std::nothrow
- Wrapped everything but #includes in #if _KERNEL_MODE to keep from redeclaring/definining operator new and nothrow in userland. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5921 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
86e8ff4d73
commit
581cfaf2c0
@ -10,9 +10,10 @@
|
||||
#include <new>
|
||||
#include <stdlib.h>
|
||||
|
||||
#if _KERNEL_MODE
|
||||
|
||||
using namespace std;
|
||||
|
||||
extern const nothrow_t std::nothrow;
|
||||
|
||||
// Oh no! C++ in the kernel! Are you nuts?
|
||||
//
|
||||
@ -72,5 +73,6 @@ operator delete[](void *ptr) throw ()
|
||||
// we're using virtuals
|
||||
extern "C" void __pure_virtual();
|
||||
|
||||
#endif // #if _KERNEL_MODE
|
||||
|
||||
#endif /* CPP_H */
|
||||
|
@ -4,9 +4,11 @@
|
||||
** This file may be used under the terms of the OpenBeOS License.
|
||||
*/
|
||||
|
||||
#if _KERNEL_MODE
|
||||
|
||||
#include "util/kernel_cpp.h"
|
||||
|
||||
const nothrow_t std::nothrow = {};
|
||||
|
||||
#if __GNUC__ == 2
|
||||
|
||||
@ -24,3 +26,5 @@ __cxa_pure_virtual()
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif // _#if KERNEL_MODE
|
||||
|
Loading…
Reference in New Issue
Block a user