From 30c9d3c0cc8a78337ec4ca6f26a50ccc08a9acf4 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 1 Dec 2017 20:27:15 -0500 Subject: [PATCH] kernel: Correct class/struct mixups. Almost certainly harmless. Spotted by Clang. --- headers/private/kernel/vm/VMArea.h | 6 +++--- headers/private/kernel/vm/VMCache.h | 2 +- src/system/kernel/device_manager/IORequest.h | 6 +++--- src/system/kernel/scheduler/scheduler_common.h | 4 ++-- src/system/kernel/slab/HashedObjectCache.h | 2 +- src/system/kernel/slab/MemoryManager.h | 2 +- src/system/kernel/slab/ObjectCache.h | 1 - 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/headers/private/kernel/vm/VMArea.h b/headers/private/kernel/vm/VMArea.h index 7c4621ce85..0c4337a9e4 100644 --- a/headers/private/kernel/vm/VMArea.h +++ b/headers/private/kernel/vm/VMArea.h @@ -148,9 +148,9 @@ protected: status_t Init(const char* name, uint32 allocationFlags); protected: - friend class VMAddressSpace; - friend class VMKernelAddressSpace; - friend class VMUserAddressSpace; + friend struct VMAddressSpace; + friend struct VMKernelAddressSpace; + friend struct VMUserAddressSpace; protected: void SetBase(addr_t base) { fBase = base; } diff --git a/headers/private/kernel/vm/VMCache.h b/headers/private/kernel/vm/VMCache.h index ffa236a280..b373c7fb4b 100644 --- a/headers/private/kernel/vm/VMCache.h +++ b/headers/private/kernel/vm/VMCache.h @@ -20,7 +20,7 @@ struct kernel_args; -class ObjectCache; +struct ObjectCache; enum { diff --git a/src/system/kernel/device_manager/IORequest.h b/src/system/kernel/device_manager/IORequest.h index f0f1e39d44..4601f7a70b 100644 --- a/src/system/kernel/device_manager/IORequest.h +++ b/src/system/kernel/device_manager/IORequest.h @@ -25,7 +25,7 @@ allocations won't fail */ #define B_DELETE_IO_REQUEST 0x04 /* delete request when finished */ -struct DMABuffer; +class DMABuffer; struct IOOperation; typedef struct IOOperation io_operation; @@ -85,8 +85,8 @@ private: }; -class IORequest; -class IORequestOwner; +struct IORequest; +struct IORequestOwner; class IORequestChunk { diff --git a/src/system/kernel/scheduler/scheduler_common.h b/src/system/kernel/scheduler/scheduler_common.h index 96e7d867ce..dc2e5f31cc 100644 --- a/src/system/kernel/scheduler/scheduler_common.h +++ b/src/system/kernel/scheduler/scheduler_common.h @@ -31,8 +31,8 @@ namespace Scheduler { -struct CPUEntry; -struct CoreEntry; +class CPUEntry; +class CoreEntry; const int kLowLoad = kMaxLoad * 20 / 100; const int kTargetLoad = kMaxLoad * 55 / 100; diff --git a/src/system/kernel/slab/HashedObjectCache.h b/src/system/kernel/slab/HashedObjectCache.h index 7007ad68d7..2ae5b07b6d 100644 --- a/src/system/kernel/slab/HashedObjectCache.h +++ b/src/system/kernel/slab/HashedObjectCache.h @@ -93,7 +93,7 @@ private: typedef BOpenHashTable HashTable; - friend class Definition; + friend struct Definition; private: void _ResizeHashTableIfNeeded(uint32 flags); diff --git a/src/system/kernel/slab/MemoryManager.h b/src/system/kernel/slab/MemoryManager.h index 9af7c96d20..f46fe14e0f 100644 --- a/src/system/kernel/slab/MemoryManager.h +++ b/src/system/kernel/slab/MemoryManager.h @@ -94,7 +94,7 @@ private: Area* GetArea() const; }; - friend class MetaChunk; + friend struct MetaChunk; typedef DoublyLinkedList MetaChunkList; struct Area : DoublyLinkedListLinkImpl { diff --git a/src/system/kernel/slab/ObjectCache.h b/src/system/kernel/slab/ObjectCache.h index 27c56cf9c4..1dac79088b 100644 --- a/src/system/kernel/slab/ObjectCache.h +++ b/src/system/kernel/slab/ObjectCache.h @@ -18,7 +18,6 @@ #include "slab_debug.h" -class AllocationTrackingInfo; struct ResizeRequest;