Merge branch 'develop' into feature/multi-communicator

This commit is contained in:
paboyle committed 2017-08-19 23:12:38 +01:00
commit be66e7dd95
11 files changed
+914 -260

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ int PointerCache::victim;
void *PointerCache::Insert(void *ptr,size_t bytes) {
if (bytes < 4096 ) return NULL;
if (bytes < 4096 ) return ptr;
#ifdef GRID_OMP
assert(omp_in_parallel()==0);