From a2353335a28e5b3d185a2dfbe5380f134fe59725 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 21 Aug 2018 15:38:38 -0400 Subject: Use alignas rather than attributes --- torus.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/torus.h b/torus.h index 9c047b9..775670c 100644 --- a/torus.h +++ b/torus.h @@ -15,15 +15,13 @@ */ #include +#include #include #include #include #include #include -#define PACKED __attribute__((packed)) -#define ALIGNED(x) __attribute__((aligned(x))) - #define ARRAY_LEN(a) (sizeof(a) / sizeof((a)[0])) #undef COLOR_BLACK @@ -64,8 +62,8 @@ struct Meta { uint32_t accessCount; }; -struct ALIGNED(4096) Tile { - char cells[CELL_ROWS][CELL_COLS]; +struct Tile { + alignas(4096) char cells[CELL_ROWS][CELL_COLS]; uint8_t colors[CELL_ROWS][CELL_COLS]; struct Meta meta; }; @@ -90,7 +88,7 @@ struct Map { }; struct ServerMessage { - enum PACKED { + enum { SERVER_TILE, SERVER_MOVE, SERVER_PUT, @@ -120,7 +118,7 @@ struct ServerMessage { static const uint8_t CURSOR_NONE = UINT8_MAX; struct ClientMessage { - enum PACKED { + enum { CLIENT_MOVE, CLIENT_PUT, CLIENT_MAP, -- cgit 1.4.1