From 1211df5f9082c07f4c827085c3e98bd2e8f9e0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 24 Feb 2003 13:20:15 +0000 Subject: [PATCH] Removed the "_dontthrow" stuff - "nothrow" is already defined anyway, and now used instead. Some style cleanups. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2829 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/bfs/cpp.cpp | 5 ++--- src/add-ons/kernel/file_systems/bfs/cpp.h | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/cpp.cpp b/src/add-ons/kernel/file_systems/bfs/cpp.cpp index 47d5ca110b..7278f4b57d 100644 --- a/src/add-ons/kernel/file_systems/bfs/cpp.cpp +++ b/src/add-ons/kernel/file_systems/bfs/cpp.cpp @@ -8,9 +8,8 @@ #include "cpp.h" -nothrow_t _dontthrow; - -extern "C" void __pure_virtual() +extern "C" void +__pure_virtual() { //printf("pure virtual function call"); } diff --git a/src/add-ons/kernel/file_systems/bfs/cpp.h b/src/add-ons/kernel/file_systems/bfs/cpp.h index c9fd65fdf3..21c75d9e48 100644 --- a/src/add-ons/kernel/file_systems/bfs/cpp.h +++ b/src/add-ons/kernel/file_systems/bfs/cpp.h @@ -22,31 +22,38 @@ // - easier to maintain -inline void *operator new(size_t size, const nothrow_t&) throw() +inline void * +operator new(size_t size, const nothrow_t&) throw() { return malloc(size); } -inline void *operator new[](size_t size, const nothrow_t&) throw() + +inline void * +operator new[](size_t size, const nothrow_t&) throw() { return malloc(size); } -inline void operator delete(void *ptr) + +inline void +operator delete(void *ptr) { free(ptr); } -inline void operator delete[](void *ptr) + +inline void +operator delete[](void *ptr) { free(ptr); } -// now we're using virtuals +// we're using virtuals extern "C" void __pure_virtual(); -extern nothrow_t _dontthrow; -#define new new (_dontthrow) +// we are only using the nothrow-version of new +#define new new (nothrow) #endif /* CPP_H */