Changeset 3f1e68f

Timestamp:

Aug 28, 2016, 11:02:06 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

413ad05

Parents:

6d665d9 (diff), 4999940 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src

Files:

• examples/gc_no_raii/containers/vector (deleted)
• examples/gc_no_raii/containers/vector.c (deleted)
• examples/gc_no_raii/premake4.lua (modified) (1 diff)
• libcfa/containers/vector (modified) (5 diffs)
• libcfa/containers/vector.c (modified) (4 diffs)

src/examples/gc_no_raii/premake4.lua

@@ -5 +5 @@
 includeDirList = {
         "src/",
-        "../",
-        "containers/"
+        "../"
 }
 

src/libcfa/containers/vector

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// vector -- 
-// 
+//
+// vector --
+//
 // Author           : Thierry Delisle
 // Created On       : Tue Jul  5 18:00:07 2016
@@ -12 +12 @@
 // Last Modified On : Tue Jul  5 18:01:35 2016
 // Update Count     : 2
-// 
+//
 
 #pragma once
@@ -28 +28 @@
         void ctor(allocator_t* const);
         void dtor(allocator_t* const);
-        void realloc(allocator_t* const, size_t);
+        void realloc_storage(allocator_t* const, size_t);
         T* data(allocator_t* const);
 };
@@ -64 +64 @@
 static inline void reserve(vector(T, allocator_t) *const this, size_t size)
 {
-        realloc(&this->storage, this->size+1);
+        realloc_storage(&this->storage, this->size+1);
 }
 
@@ -146 +146 @@
 
 forall(otype T)
-void realloc(heap_allocator(T) *const this, size_t size);
+void realloc_storage(heap_allocator(T) *const this, size_t size);
 
 forall(otype T)

src/libcfa/containers/vector.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// vector.c -- 
-// 
+//
+// vector.c --
+//
 // Author           : Thierry Delisle
 // Created On       : Tue Jul  5 18:07:52 2016
@@ -12 +12 @@
 // Last Modified On : Tue Jul  5 18:08:31 2016
 // Update Count     : 2
-// 
+//
 
-#include <containers/vector> 
+#include <containers/vector>
 
 #include <stdlib>
@@ -39 +39 @@
 void push_back(vector(T, allocator_t) *const this, T value)
 {
-        realloc(&this->storage, this->size+1);
+        realloc_storage(&this->storage, this->size+1);
         data(&this->storage)[this->size] = value;
         this->size++;
@@ -77 +77 @@
 
 forall(otype T)
-inline void realloc(heap_allocator(T) *const this, size_t size)
+inline void realloc_storage(heap_allocator(T) *const this, size_t size)
 {
         enum { GROWTH_RATE = 2 };