From 72b41e2f711198ad9baa846e7ba37f6e070cedb0 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Fri, 30 Jan 2026 08:10:48 +0100
Subject: chore: ddk: Fix build on nebuild for C++ DDK. chore: kernel: Tweaks
 and internal improvements.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 src/libDDK/DriverKit/c++/checksum.h    | 3 +--
 src/libDDK/DriverKit/c++/ddk.h         | 2 +-
 src/libDDK/DriverKit/c++/driver_base.h | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/libDDK/DriverKit/c++')

diff --git a/src/libDDK/DriverKit/c++/checksum.h b/src/libDDK/DriverKit/c++/checksum.h
index 4cc87423..55d3d58f 100644
--- a/src/libDDK/DriverKit/c++/checksum.h
+++ b/src/libDDK/DriverKit/c++/checksum.h
@@ -33,7 +33,6 @@ inline UInt64 rtl_checksum(const IndexableBlob path) {
 
 using Blob = VoidPtr;
 
-}
-
+}  // namespace Kernel::DDK
 
 #endif
diff --git a/src/libDDK/DriverKit/c++/ddk.h b/src/libDDK/DriverKit/c++/ddk.h
index 857a65a7..f05b86bc 100644
--- a/src/libDDK/DriverKit/c++/ddk.h
+++ b/src/libDDK/DriverKit/c++/ddk.h
@@ -5,7 +5,7 @@
 #ifndef DRIVERKIT_DDK_H
 #define DRIVERKIT_DDK_H
 
-#include <DriverKit/c++/driver_base.h>
 #include <DriverKit/c++/checksum.h>
+#include <DriverKit/c++/driver_base.h>
 
 #endif
diff --git a/src/libDDK/DriverKit/c++/driver_base.h b/src/libDDK/DriverKit/c++/driver_base.h
index 82e5bd44..1d6057b3 100644
--- a/src/libDDK/DriverKit/c++/driver_base.h
+++ b/src/libDDK/DriverKit/c++/driver_base.h
@@ -5,12 +5,11 @@
 #ifndef DRIVERKIT_DRIVER_BASE_H
 #define DRIVERKIT_DRIVER_BASE_H
 
-#include <CompilerKit/CompilerKit.h>
 #include <libDDK/DriverKit/macros.h>
 
 #define DDK_DRIVER_IMPL \
   final:                \
-  public                \
+ public                 \
   ::Kernel::DDK::IDriverBase
 
 /// @author Amlal El Mahrouss
@@ -25,7 +24,8 @@ class IDriverBase {
   IDriverBase()          = default;
   virtual ~IDriverBase() = default;
 
-  NE_COPY_DELETE(IDriverBase);
+  IDriverBase& operator=(const IDriverBase&) = delete;
+  IDriverBase(const IDriverBase&)            = delete;
 
   using PtrType = void*;
 
@@ -39,7 +39,7 @@ class IDriverBase {
 /// @author @amlel-el-mahrouss
 template <typename Driver>
 concept IsValidDriver = requires(Driver drv) {
-  { drv.IsActive() && drv.Type() > kInvalidType };
+  {drv.IsActive() && drv.Type() > kInvalidType};
 };
 }  // namespace Kernel::DDK
 
-- 
cgit v1.2.3