From 6467297a1b2e6aed10add9aadae941d66d3451fe Mon Sep 17 00:00:00 2001 From: X512 Date: Sat, 5 Dec 2020 00:29:35 +0900 Subject: [PATCH] simplify AutoDeleter code by using typedef Change-Id: I726c3aee794b91ed51970853db3921d17a5f795e Reviewed-on: https://review.haiku-os.org/c/haiku/+/3462 Reviewed-by: Adrien Destugues --- .../kernel/file_systems/bindfs/Utils.h | 19 +------------------ .../boot/loader/file_systems/tarfs/tarfs.cpp | 14 +------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bindfs/Utils.h b/src/add-ons/kernel/file_systems/bindfs/Utils.h index aaf71a3ff0..bff927bd5e 100644 --- a/src/add-ons/kernel/file_systems/bindfs/Utils.h +++ b/src/add-ons/kernel/file_systems/bindfs/Utils.h @@ -11,24 +11,7 @@ #include -using BPrivate::AutoDeleter; - - -struct VnodePut -{ - inline void operator()(vnode* _vnode) - { - if (_vnode != NULL) - vfs_put_vnode(_vnode); - } -}; - -struct VnodePutter : AutoDeleter -{ - VnodePutter() : AutoDeleter() {} - - VnodePutter(vnode* _vnode) : AutoDeleter(_vnode) {} -}; +typedef CObjectDeleter VnodePutter; #endif // UTILS_H diff --git a/src/system/boot/loader/file_systems/tarfs/tarfs.cpp b/src/system/boot/loader/file_systems/tarfs/tarfs.cpp index 552d8003b6..2adc5cf25b 100644 --- a/src/system/boot/loader/file_systems/tarfs/tarfs.cpp +++ b/src/system/boot/loader/file_systems/tarfs/tarfs.cpp @@ -52,19 +52,7 @@ struct RegionDelete { } }; -struct RegionDeleter : BPrivate::AutoDeleter { - RegionDeleter() - : - BPrivate::AutoDeleter() - { - } - - RegionDeleter(void* memory) - : - BPrivate::AutoDeleter(memory) - { - } -}; +typedef BPrivate::AutoDeleter RegionDeleter; class Directory;