# HG changeset patch
# User Sean Halle <seanhalle@yahoo.com>
# Date 1374589842 25200
# Node ID 7731a4d31baa8cd971185eca5ec01950184b674b
# Parent  7a5228a4a3778379a1e0db9fef6f48cb0f73fdcd
new branch -- Univ_dev -- changed headers and PR__malloc

diff -r 7a5228a4a377 -r 7731a4d31baa ListOfArrays.c
--- a/ListOfArrays.c	Mon Sep 03 15:08:15 2012 -0700
+++ b/ListOfArrays.c	Tue Jul 23 07:30:42 2013 -0700
@@ -1,9 +1,9 @@
 
 #include "ListOfArrays.h"
-#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h"
+#include "PR__common_includes/Services_Offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
 
 ListOfArrays* makeListOfArrays(size_t entry_size, int num_entries_per_block){
-    ListOfArrays* newLoA = (ListOfArrays*) PR_int__malloc(sizeof(ListOfArrays));
+    ListOfArrays* newLoA = (ListOfArrays*) PR__malloc(sizeof(ListOfArrays));
     newLoA->dim1info = makePrivDynArrayOfSize(&(newLoA->dim1),8);
        
     newLoA->entry_size = entry_size;
@@ -32,15 +32,15 @@
 }
 
 void freeListOfArrays(ListOfArrays* list){
-    freeDynArrayDeep(list->dim1info,&PR_int__free);
-    PR_int__free((void*)list);
+    freeDynArrayDeep(list->dim1info,&PR_WL__free);
+    PR_WL__free((void*)list);
 }
 
 /*
 void addToListOfArraysDependency(Dependency value, ListOfArrays* list){
     int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; 
     if(offset_in_fragment == 0){ 
-        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); 
+        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); 
         addToDynArray(newBlock,list->dim1info); 
     } 
     Dependency* typedFragment = (Dependency*) ((list->dim1)[list->dim1info->numInArray -1]); 
@@ -51,7 +51,7 @@
 void addToListOfArraysUnit(Unit value, ListOfArrays* list){
     int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; 
     if(offset_in_fragment == 0){ 
-        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); 
+        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); 
         addToDynArray(newBlock,list->dim1info); 
     } 
     Unit* typedFragment = (Unit*) ((list->dim1)[list->dim1info->numInArray -1]); 
diff -r 7a5228a4a377 -r 7731a4d31baa ListOfArrays.h
--- a/ListOfArrays.h	Mon Sep 03 15:08:15 2012 -0700
+++ b/ListOfArrays.h	Tue Jul 23 07:30:42 2013 -0700
@@ -9,6 +9,9 @@
 #define	_LISTOFARRAYS_H
 
 #include<stddef.h>
+#include <inttypes.h>
+
+#include "PR__common_includes/PR__primitive_data_types.h"
 #include "DynArray/DynArray.h"
 
 
@@ -31,7 +34,7 @@
 #define addToListOfArrays(type,value,list) do { \
     int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; \
     if(offset_in_fragment == 0){ \
-        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); \
+        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); \
         addToDynArray(newBlock,list->dim1info); \
     } \
     type* typedFragment = (type*) ((list->dim1)[list->dim1info->numInArray -1]); \
diff -r 7a5228a4a377 -r 7731a4d31baa __brch__Renamed_VMS_to_PR
--- a/__brch__Renamed_VMS_to_PR	Mon Sep 03 15:08:15 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
-
-More importantly, the MC_shared  version of PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
-
diff -r 7a5228a4a377 -r 7731a4d31baa __brch__Univ_dev
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/__brch__Univ_dev	Tue Jul 23 07:30:42 2013 -0700
@@ -0,0 +1,4 @@
+This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
+
+More importantly, the MC_shared  version of PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
+