--- trunk/uoms/src/mem_manager.upc	2010/04/05 17:12:14	1
+++ trunk/uoms/src/mem_manager.upc	2010/04/23 09:49:46	7
@@ -132,9 +132,10 @@
 			p2pDistArr = upc_all_alloc(THREADS,nbytes);
 			UPCMEM_OK(p2pDistArr);
 			if(mem_is_ok == -1) return -1;
-#ifdef ASYNC_MEM_TEST
+#if defined (ASYNC_MEM_TEST) || defined (ASYNCI_MEM_TEST)
 			if(operation_code == MEMCPY || operation_code == LMEMCPY ||
-			   operation_code == AMEMCPY || operation_code == ALMEMCPY){
+			   operation_code == AMEMCPY || operation_code == ALMEMCPY ||
+			   operation_code == AIMEMCPY || operation_code == AILMEMCPY){
 #else
 			if(operation_code == MEMCPY || operation_code == LMEMCPY){
 #endif
@@ -373,9 +374,10 @@
 		else{
 			if (MYTHREAD == 0){ 
 				upc_free(p2pDistArr);
-#ifdef ASYNC_MEM_TEST
+#if defined (ASYNC_MEM_TEST) || defined (ASYNCI_MEM_TEST)
 				if(operation_code == MEMCPY || operation_code == LMEMCPY ||
-				   operation_code == AMEMCPY || operation_code == ALMEMCPY){
+				   operation_code == AMEMCPY || operation_code == ALMEMCPY ||
+				   operation_code == AIMEMCPY || operation_code == AILMEMCPY){
 #else
 				if(operation_code == MEMCPY || operation_code == LMEMCPY){
 #endif