RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 09:37:45 +00:00
Code Issues Activity Actions

AK+Kernel: Remove NO_DISCARD macro hack

Browse source 
This was added as clang-format would mess up the formatting when using
[[nodiscard]] on a class, which is no longer the case.
This commit is contained in:
Linus Groh 2021-03-03 23:03:38 +01:00 • committed by Andreas Kling
parent 95b49691c5
commit a5d6962148
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
AK/Platform.h
View file

@ -60,11 +60,6 @@
#endif #endif
#define FLATTEN [[gnu::flatten]] #define FLATTEN [[gnu::flatten]]
#ifdef NO_DISCARD
# undef NO_DISCARD
#endif
#define NO_DISCARD [[nodiscard]]
#ifndef __serenity__ #ifndef __serenity__
# define PAGE_SIZE sysconf(_SC_PAGESIZE) # define PAGE_SIZE sysconf(_SC_PAGESIZE)
#endif #endif

2
Kernel/SpinLock.h
View file

@ -126,7 +126,7 @@ private:
}; };
template<typename LockType> template<typename LockType>
class NO_DISCARD ScopedSpinLock { class [[nodiscard]] ScopedSpinLock {
AK_MAKE_NONCOPYABLE(ScopedSpinLock); AK_MAKE_NONCOPYABLE(ScopedSpinLock);