From 5b6fe884db3fcf7d4e9bc81807f5320d9fd430d4 Mon Sep 17 00:00:00 2001
From: Evan Ramos <evan@hpccharm.com>
Date: Fri, 23 Feb 2018 10:56:41 -0600
Subject: [PATCH] Fix C++ build errors in machine-cma.c

Change-Id: I242abc5cdd0365b07ff000a058da82474c4db1bb
---
 src/arch/util/machine-cma.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arch/util/machine-cma.c b/src/arch/util/machine-cma.c
index 4939db399f..780066bd35 100644
--- a/src/arch/util/machine-cma.c
+++ b/src/arch/util/machine-cma.c
@@ -93,7 +93,7 @@ void handleOneCmaMdMsg(int *sizePtr, char **msgPtr) {
   CmaSrcBufferInfo_t *bufInfo = (CmaSrcBufferInfo_t *)(*msgPtr + CmiMsgHeaderSizeBytes);
 
   // Allocate a buffer to hold the buffer
-  destAddr = CmiAlloc(bufInfo->size);
+  destAddr = (char *)CmiAlloc(bufInfo->size);
 
   local.iov_base = (void *)destAddr;
   local.iov_len  = bufInfo->size;
@@ -130,7 +130,7 @@ void handleOneCmaMdMsg(int *sizePtr, char **msgPtr) {
 void handleOneCmaAckMsg(int size, void *msg) {
 
   // Get buffer metadata
-  CmaSrcBufferInfo_t *bufInfo = (CmaSrcBufferInfo_t *)(msg + CmiMsgHeaderSizeBytes);
+  CmaSrcBufferInfo_t *bufInfo = (CmaSrcBufferInfo_t *)((char *)msg + CmiMsgHeaderSizeBytes);
 
   // Free the large buffer sent
   CmiFree(bufInfo->srcAddr);
@@ -146,7 +146,7 @@ void CmiSendMessageCma(char **msgPtr, int *sizePtr) {
 
   // Send buffer metadata instead of original msg
   // Buffer metadata msg consists of pid, addr, size for the other process to perform a read through CMA
-  char *cmaBufMdMsg = CmiAlloc(CmiMsgHeaderSizeBytes + sizeof(CmaSrcBufferInfo_t));
+  char *cmaBufMdMsg = (char *)CmiAlloc(CmiMsgHeaderSizeBytes + sizeof(CmaSrcBufferInfo_t));
   CmaSrcBufferInfo_t *bufInfo = (CmaSrcBufferInfo_t *)(cmaBufMdMsg + CmiMsgHeaderSizeBytes);
   bufInfo->srcPE  = CmiMyPe();
   bufInfo->srcPid = getpid();
-- 
2.11.4.GIT