i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Added operator delete(ptr, nothrow_t)

Browse Source 
* This seems to be required when building the DriveEncryption kernel
  driver with gcc 11.2 on x86-64, at least.

Change-Id: Ie1ae09435dd912021957e64d4b9a3e7b05913c33
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5742
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Axel Dörfler
2022-10-12 20:35:55 +00:00
committed by waddlesplash
parent 2c563c4c9b
commit 97739603d1
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/kernel_cpp.h
+3 -2
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2003-2004, Axel Dörfler, [email protected]. * Copyright 2003-2022, Axel Dörfler, [email protected].
* Copyright 2004-2018, Haiku, Inc. All rights reserved. * Copyright 2004-2022, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _KERNEL_UTIL_KERNEL_CPP_H #ifndef _KERNEL_UTIL_KERNEL_CPP_H
@@ -36,6 +36,7 @@ extern void* operator new(size_t size, const mynothrow_t &) _NOEXCEPT;
extern void* operator new[](size_t size, const mynothrow_t &) _NOEXCEPT; extern void* operator new[](size_t size, const mynothrow_t &) _NOEXCEPT;
extern void operator delete(void *ptr) _NOEXCEPT; extern void operator delete(void *ptr) _NOEXCEPT;
extern void operator delete[](void *ptr) _NOEXCEPT; extern void operator delete[](void *ptr) _NOEXCEPT;
extern void operator delete(void *ptr, const std::nothrow_t &) _NOEXCEPT;
#if __cplusplus >= 201402L #if __cplusplus >= 201402L
extern void operator delete(void* ptr, std::size_t) _NOEXCEPT; extern void operator delete(void* ptr, std::size_t) _NOEXCEPT;
src/system/kernel/util/kernel_cpp.cpp
+9 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2003-2007, Haiku Inc. All rights reserved. * Copyright 2003-2022, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -7,6 +7,7 @@
* Ingo Weinhold, [email protected]. * Ingo Weinhold, [email protected].
*/ */
//! C++ in the kernel //! C++ in the kernel
@@ -142,6 +143,13 @@ operator delete[](void *ptr) _NOEXCEPT
} }
void
operator delete(void *ptr, std::nothrow_t const &) _NOEXCEPT
{
free(ptr);
}
#if __cplusplus >= 201402L #if __cplusplus >= 201402L
void void