From 555937753206ef67f743ade5bbf990907f98a0f9 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sat, 18 Jan 2014 15:38:03 +0100 Subject: [PATCH] Replace kernel STATIC_ASSERT macro with C++11 static_assert. --- kernel/include/sortix/kernel/decl.h | 7 +++---- kernel/interrupt.cpp | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kernel/include/sortix/kernel/decl.h b/kernel/include/sortix/kernel/decl.h index fb693f11..bd0f325d 100644 --- a/kernel/include/sortix/kernel/decl.h +++ b/kernel/include/sortix/kernel/decl.h @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. This file is part of Sortix. @@ -23,8 +23,8 @@ *******************************************************************************/ -#ifndef SORTIX_DECL_H -#define SORTIX_DECL_H +#ifndef INCLUDE_SORTIX_KERNEL_DECL_H +#define INCLUDE_SORTIX_KERNEL_DECL_H #include @@ -32,7 +32,6 @@ typedef uintptr_t addr_t; #define likely(x) __builtin_expect((x),1) #define unlikely(x) __builtin_expect((x),0) -#define STATIC_ASSERT(condition) static_assert(condition, #condition) #if !defined(CPU) && defined(__i386__) #define CPU X86 diff --git a/kernel/interrupt.cpp b/kernel/interrupt.cpp index 0f406f43..4cc1d53f 100644 --- a/kernel/interrupt.cpp +++ b/kernel/interrupt.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. This file is part of Sortix. @@ -336,14 +336,14 @@ struct Package size_t size; size_t payloadoffset; size_t payloadsize; - WorkHandler handler; // TODO: May not be correctly aligned on some systems. + WorkHandler handler; uint8_t payload[0]; }; void InitWorker() { const size_t QUEUE_SIZE = 4UL*1024UL; - STATIC_ASSERT(QUEUE_SIZE % sizeof(Package) == 0); + static_assert(QUEUE_SIZE % sizeof(Package) == 0, "QUEUE_SIZE must be a multiple of the package size"); queue = new uint8_t[QUEUE_SIZE]; if ( !queue ) Panic("Can't allocate interrupt worker queue");