From e0511197698f80f6356ab07a2ca60c98b152056b Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Wed, 2 Mar 2016 07:00:00 -0800
Subject: [PATCH] extern "C" should have been in the header file, but Cray is
 apparently not C++ friendly.

---
 lib/AlignedAllocator.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/AlignedAllocator.h b/lib/AlignedAllocator.h
index 6faf6302..22b6297e 100644
--- a/lib/AlignedAllocator.h
+++ b/lib/AlignedAllocator.h
@@ -40,8 +40,13 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #ifdef HAVE_MM_MALLOC_H
 #include <mm_malloc.h>
 #endif
+
 #ifdef GRID_COMMS_SHMEM
+extern "C" { 
 #include <mpp/shmem.h>
+extern void * shmem_align(size_t, size_t);
+extern void  shmem_free(void *);
+}
 #endif
 
 namespace Grid {