Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fix.

Browse Source 
Desynchronisation between fs_shell and normal autodeleter files
This commit is contained in:
Adrien Destugues 2020-12-10 18:01:22 +01:00
parent efc042ff48
commit 5b627acb33
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
headers/private/fs_shell/fssh_auto_deleter.h
View File

@ -129,41 +129,31 @@ struct MemoryDeleter : AutoDeleter<void, MemoryDelete >
// CObjectDeleter
template<typename Type, typename DestructorReturnType>
template<typename Type, typename DestructorReturnType,
DestructorReturnType (*Destructor)(Type*)>
struct CObjectDelete
{
inline void operator()(Type *object)
{
if (fDestructor != NULL && object != NULL)
fDestructor(object);
if (object != NULL)
Destructor(object);
}
template<typename Destructor>
inline void operator=(Destructor destructor)
{
fDestructor = destructor;
}
private:
DestructorReturnType (*fDestructor)(Type*);
};
template<typename Type, typename DestructorReturnType = void>
template<typename Type, typename DestructorReturnType,
DestructorReturnType (*Destructor)(Type*)>
struct CObjectDeleter
: AutoDeleter<Type, CObjectDelete<Type, DestructorReturnType> >
: AutoDeleter<Type, CObjectDelete<Type, DestructorReturnType, Destructor> >
{
typedef AutoDeleter<Type, CObjectDelete<Type, DestructorReturnType> > Base;
typedef AutoDeleter<Type,
CObjectDelete<Type, DestructorReturnType, Destructor> > Base;
template<typename Destructor>
CObjectDeleter(Destructor destructor) : Base()
CObjectDeleter() : Base()
{
Base::fDelete = destructor;
}
template<typename Destructor>
CObjectDeleter(Type *object, Destructor destructor) : Base(object)
CObjectDeleter(Type *object) : Base(object)
{
Base::fDelete = destructor;
}
};