Added preproccessor guards.

Author: vehre

CMakeLists.txt

@@ -206,7 +206,7 @@ if(opencoarrays_aware_compiler)
 
   # Integration tests verifying the use of libcaf_mpi in applications
   add_mpi_test(hello_multiverse 2 ${tests_root}/integration/coarrayHelloWorld/hello_multiverse)
-  add_mpi_test(coarray_burgers_pde 2 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
+  add_mpi_test(coarray_burgers_pde 4 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
   add_mpi_test(co_heat 2 ${tests_root}/integration/pde_solvers/coarrayHeatSimplified/co_heat)
   if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
     if ( NOT (DEFINED ENV{TRAVIS}))

src/libcaf.h

@@ -43,6 +43,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 #define unlikely(x)     __builtin_expect(!!(x), 0)
 #endif
 
+#if __GNUC__ >= 7
+#define GCC_GE_7 1
+#endif
+
 #ifdef PREFIX_NAME
 #define PREFIX3(X,Y) X ## Y
 #define PREFIX2(X,Y) PREFIX3(X,Y)
@@ -101,6 +105,7 @@ typedef struct caf_vector_t {
 caf_vector_t;
 
 
+#ifdef GCC_GE_7
 /* Keep in sync with gcc/libgfortran/caf/libcaf.h.  */
 typedef enum caf_ref_type_t {
   /* Reference a component of a derived type, either regular one or an
@@ -179,6 +184,7 @@ typedef struct caf_reference_t {
     } a;
   } u;
 } caf_reference_t;
+#endif
 
 
 /* Common auxiliary functions: caf_auxiliary.c.  */
@@ -194,8 +200,13 @@ void PREFIX (finalize) (void);
 int PREFIX (this_image) (int);
 int PREFIX (num_images) (int, int);
 
+#ifdef GCC_GE_7
 void PREFIX (register) (size_t, caf_register_t, caf_token_t *,
 						gfc_descriptor_t *, int *, char *, int);
+#else
+void * PREFIX (register) (size_t, caf_register_t, caf_token_t *,
+						  int *, char *, int);
+#endif
 void PREFIX (deregister) (caf_token_t *, int *, char *, int);
 
 void PREFIX (caf_get) (caf_token_t, size_t, int, gfc_descriptor_t *,
@@ -207,6 +218,7 @@ void PREFIX (caf_sendget) (caf_token_t, size_t, int, gfc_descriptor_t *,
 			   caf_vector_t *, caf_token_t, size_t, int,
 			   gfc_descriptor_t *, caf_vector_t *, int, int);
 
+#ifdef GCC_GE_7
 void PREFIX(get_by_ref) (caf_token_t, int,
 							 gfc_descriptor_t *dst, caf_reference_t *refs,
 							 int dst_kind, int src_kind, bool may_require_tmp,
@@ -219,6 +231,7 @@ void PREFIX(sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
 		caf_reference_t *dst_refs, caf_token_t src_token, int src_image_index,
 		caf_reference_t *src_refs, int dst_kind, int src_kind,
 		bool may_require_tmp, int *dst_stat, int *src_stat);
+#endif
 
 void PREFIX (co_max) (gfc_descriptor_t *, int, int *, char *, int, int);
 void PREFIX (co_min) (gfc_descriptor_t *, int, int *, char *, int, int);

src/mpi/mpi_caf.c

@@ -465,6 +465,7 @@ PREFIX (num_images)(int distance __attribute__ ((unused)),
 }
 
 
+#ifdef GCC_GE_7
 #ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
 void
   _gfortran_caf_register (size_t size, caf_register_t type, caf_token_t *token,
@@ -474,6 +475,17 @@ void
   PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
                 gfc_descriptor_t *desc, int *stat, char *errmsg, int errmsg_len)
 #endif
+#else
+#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
+void *
+  _gfortran_caf_register (size_t size, caf_register_t type, caf_token_t *token,
+                int *stat, char *errmsg, int errmsg_len)
+#else
+void *
+  PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
+                int *stat, char *errmsg, int errmsg_len)
+#endif
+#endif
 {
   /* int ierr; */
   void *mem;
@@ -553,8 +565,12 @@ void
   if (stat)
     *stat = 0;
 
+#ifdef GCC_GE_7
   desc->base_addr = mem;
   return;
+#else
+  return mem;
+#endif
 
 error:
   {
@@ -580,6 +596,9 @@ void
     else
       caf_runtime_error (msg);
   }
+#ifndef GCC_GE_7
+  return NULL;
+#endif
 }
 
 
@@ -1595,6 +1614,7 @@ PREFIX (get) (caf_token_t token, size_t offset,
 }
 
 
+#ifdef GCC_GE_7
 void
 PREFIX(get_by_ref) (caf_token_t token, int image_idx,
                         gfc_descriptor_t *dst, caf_reference_t *refs,
@@ -1664,6 +1684,8 @@ PREFIX(sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
   fprintf (stderr, "COARRAY ERROR: caf_sendget_by_ref() not implemented yet ");
   error_stop (1);
 }
+#endif
+
 
 /* SYNC IMAGES. Note: SYNC IMAGES(*) is passed as count == -1 while
    SYNC IMAGES([]) has count == 0. Note further that SYNC IMAGES(*)