Ignore:
Timestamp:
Jan 14, 2016, 3:09:56 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:
a2b2761
Parents:
0ada2f0
Message:

more conversion and compile seems to work well

Location:
src/examples/gc_no_raii
Files:
5 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • src/examples/gc_no_raii/gcpointers.c

    r0ada2f0 re47f529  
    22
    33#include "gc.h"
     4#include "internal/collector.h"
     5#include "internal/object_header.h"
     6#include "internal/state.h"
    47
    58void register_ptr(gcpointer_t* this)

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

    r0ada2f0 re47f529  
    11#pragma once
    22
     3#include <stddef.h>
    34#include <stdint.h>
    45
    … …  
    1516        #endif
    1617
    17         size_t          size;
    18         gcpointer_t*    root_chain;
    19         gcpointer_t*    type_chain;
    20         object_header*  forward;
    21         bool                    is_forwarded;
     18        size_t                          size;
     19        gcpointer_t*                    root_chain;
     20        gcpointer_t*                    type_chain;
     21        struct gc_object_header*        forward;
     22        bool                                    is_forwarded;
    2223
    2324        #if _DEBUG

  • src/examples/gc_no_raii/premake4.lua

    r0ada2f0 re47f529  
    44
    55includeDirList = {
    6         "../"
     6        "./",
     7        "../",
    78}
    89
    … …  
    1819end
    1920
    20 premake.gcc.cc = "../cfa"
    21 premake.gcc.cxx = "../cfa"
    22 
    2321-- Build Options:
    2422buildOptions = {""}
    2523
    26 solution "CS488-Projects"
     24solution "GC-no-RAII"
    2725    configurations { "Debug", "Release" }
    2826
    29     project "GC_TEST"
     27    project "gc-test"
    3028        kind "ConsoleApp"
    3129        language "C"
    … …  
    4139
    4240    configuration "Debug"
    43         defines { "DEBUG" }
     41        defines { "DEBUG", "bool=_Bool" }
    4442        flags { "Symbols" }
    4543
    4644    configuration "Release"
    47         defines { "NDEBUG" }
     45        defines { "NDEBUG", "bool=_Bool" }
    4846        flags { "Optimize" }

  • src/examples/gc_no_raii/tools.h

    r0ada2f0 re47f529  
    11#pragma once
    22
    3 #ifndef _DEBUG
    4 #define _DEBUG 0
    5 #endif
    6 
    7 #define DEF_bool 1
    8 #if DEF_bool
    9 #define bool _Bool
    10 #endif
    11 
    12 #include "tools/checks.hpp"
    13 #include "tools/print.hpp"
     3#include "tools/checks.h"
     4#include "tools/print.h"

  • src/examples/gc_no_raii/tools/print.h

    r0ada2f0 re47f529  
    77extern ofstream *sout;
    88
    9 #define DEBUG(x) sout | x | endl;
     9#define DEBUG_OUT(x) sout | x | endl;
    1010
    1111#else
    1212
    13 #define DEBUG(x)
     13#define DEBUG_OUT(x)
    1414
    1515#endif //NO_CHECKS
Note: See TracChangeset for help on using the changeset viewer.