1.1 --- a/ListOfArrays.c	Mon Sep 03 15:08:15 2012 -0700
     1.2 +++ b/ListOfArrays.c	Tue Jul 23 07:30:42 2013 -0700
     1.3 @@ -1,9 +1,9 @@
     1.4  
     1.5  #include "ListOfArrays.h"
     1.6 -#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h"
     1.7 +#include "PR__common_includes/Services_Offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
     1.8  
     1.9  ListOfArrays* makeListOfArrays(size_t entry_size, int num_entries_per_block){
    1.10 -    ListOfArrays* newLoA = (ListOfArrays*) PR_int__malloc(sizeof(ListOfArrays));
    1.11 +    ListOfArrays* newLoA = (ListOfArrays*) PR__malloc(sizeof(ListOfArrays));
    1.12      newLoA->dim1info = makePrivDynArrayOfSize(&(newLoA->dim1),8);
    1.13         
    1.14      newLoA->entry_size = entry_size;
    1.15 @@ -32,15 +32,15 @@
    1.16  }
    1.17  
    1.18  void freeListOfArrays(ListOfArrays* list){
    1.19 -    freeDynArrayDeep(list->dim1info,&PR_int__free);
    1.20 -    PR_int__free((void*)list);
    1.21 +    freeDynArrayDeep(list->dim1info,&PR_WL__free);
    1.22 +    PR_WL__free((void*)list);
    1.23  }
    1.24  
    1.25  /*
    1.26  void addToListOfArraysDependency(Dependency value, ListOfArrays* list){
    1.27      int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; 
    1.28      if(offset_in_fragment == 0){ 
    1.29 -        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.30 +        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.31          addToDynArray(newBlock,list->dim1info); 
    1.32      } 
    1.33      Dependency* typedFragment = (Dependency*) ((list->dim1)[list->dim1info->numInArray -1]); 
    1.34 @@ -51,7 +51,7 @@
    1.35  void addToListOfArraysUnit(Unit value, ListOfArrays* list){
    1.36      int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; 
    1.37      if(offset_in_fragment == 0){ 
    1.38 -        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.39 +        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.40          addToDynArray(newBlock,list->dim1info); 
    1.41      } 
    1.42      Unit* typedFragment = (Unit*) ((list->dim1)[list->dim1info->numInArray -1]);