Changeset 1b5c81ed

Timestamp:

Jun 30, 2016, 4:20:53 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f80e0218

Parents:

34b76a8

Message:

fixed several compilation errors

Location:

src/examples/gc_no_raii/src

Files:

• internal/globals.h (modified) (1 diff)
• internal/object_header.h (modified) (1 diff)
• internal/state.c (modified) (1 diff)
• vector.c (modified) (1 diff)

src/examples/gc_no_raii/src/internal/globals.h

@@ -16 +16 @@
 // static const size_t OBJECT_PTR_MASK = ~(OBJECT_ALLIGNMENT - 1);
 
+enum {
+        POOL_SIZE_EXP   = 24,
+        POOL_SIZE_BYTES         = 0x1 << POOL_SIZE_EXP,
+        POOL_PTR_MASK   = ~(POOL_SIZE_BYTES - 1),
 
-#define POOL_SIZE_EXP 24
-#define POOL_SIZE_BYTES 0x1 << POOL_SIZE_EXP
-#define POOL_PTR_MASK ~(POOL_SIZE_BYTES - 1)
+        CARDS_SIZE_EXP  = 12,
+        CARDS_SIZE_BYTES        = 0x1 << CARDS_SIZE_EXP,
+        CARDS_OFFSET_MASK       = (~(CARDS_SIZE_BYTES - 1)) & (POOL_SIZE_BYTES - 1),
+        CARDS_COUNT     = POOL_SIZE_BYTES / CARDS_SIZE_BYTES,
 
-#define CARDS_SIZE_EXP 12
-#define CARDS_SIZE_BYTES 0x1 << CARDS_SIZE_EXP
-#define CARDS_OFFSET_MASK (~(CARDS_SIZE_BYTES - 1)) & (POOL_SIZE_BYTES - 1)
-#define CARDS_COUNT POOL_SIZE_BYTES / CARDS_SIZE_BYTES
-
-#define OBJECT_ALLIGNMENT sizeof(size_t)
-#define OBJECT_PTR_MASK ~(OBJECT_ALLIGNMENT - 1)
+        OBJECT_ALLIGNMENT       = sizeof(size_t),
+        OBJECT_PTR_MASK         = ~(OBJECT_ALLIGNMENT - 1),
+};

src/examples/gc_no_raii/src/internal/object_header.h

@@ -1 +1 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

src/examples/gc_no_raii/src/internal/state.c

@@ -26 +26 @@
 #endif
 
+static gc_state s;
+
 gc_state* gc_get_state()
 {
-        static gc_state s;
         if(!s.is_initialized) ctor(&s);
         return &s;

src/examples/gc_no_raii/src/vector.c

@@ -64 +64 @@
 inline void realloc(heap_allocator(T) *const this, size_t size)
 {
-        static const size_t GROWTH_RATE = 2;
+        enum { GROWTH_RATE = 2 };
         if(size > this->capacity)
         {