Merge pull request #8494 from bosilca/fix/remove_anonymous_struct

Be pedantic to keep some compilers happy.

Author: bosilca

ompi/mca/coll/adapt/coll_adapt_algorithms.h

@@ -14,17 +14,6 @@
 #include "ompi/mca/coll/base/coll_base_functions.h"
 #include <math.h>
 
-typedef int (*ompi_mca_coll_adapt_ibcast_function_t)(IBCAST_ARGS);
-typedef int (*ompi_mca_coll_adapt_ireduce_function_t)(IREDUCE_ARGS);
-
-typedef struct ompi_coll_adapt_algorithm_index_s {
-    int algorithm_index;
-    union {
-        ompi_mca_coll_adapt_ibcast_function_t  ibcast_fn_ptr;
-        ompi_mca_coll_adapt_ireduce_function_t ireduce_fn_ptr;
-    };
-} ompi_coll_adapt_algorithm_index_t;
-
 /* Bcast */
 int ompi_coll_adapt_ibcast_register(void);
 int ompi_coll_adapt_ibcast_fini(void);

ompi/mca/coll/han/coll_han.h

@@ -247,7 +247,7 @@ typedef struct mca_coll_han_single_collective_fallback_s {
         mca_coll_base_module_gather_fn_t gather;
         mca_coll_base_module_reduce_fn_t reduce;
         mca_coll_base_module_scatter_fn_t scatter;
-    };
+    } module_fn;
     mca_coll_base_module_t* module;
 } mca_coll_han_single_collective_fallback_t;
 
@@ -316,36 +316,36 @@ OBJ_CLASS_DECLARATION(mca_coll_han_module_t);
  * Some defines to stick to the naming used in the other components in terms of
  * fallback routines
  */
-#define previous_allgather          fallback.allgather.allgather
+#define previous_allgather          fallback.allgather.module_fn.allgather
 #define previous_allgather_module   fallback.allgather.module
 
-#define previous_allgatherv         fallback.allgatherv.allgatherv
+#define previous_allgatherv         fallback.allgatherv.module_fn.allgatherv
 #define previous_allgatherv_module  fallback.allgatherv.module
 
-#define previous_allreduce          fallback.allreduce.allreduce
+#define previous_allreduce          fallback.allreduce.module_fn.allreduce
 #define previous_allreduce_module   fallback.allreduce.module
 
-#define previous_barrier            fallback.barrier.barrier
+#define previous_barrier            fallback.barrier.module_fn.barrier
 #define previous_barrier_module     fallback.barrier.module
 
-#define previous_bcast              fallback.bcast.bcast
+#define previous_bcast              fallback.bcast.module_fn.bcast
 #define previous_bcast_module       fallback.bcast.module
 
-#define previous_reduce             fallback.reduce.reduce
+#define previous_reduce             fallback.reduce.module_fn.reduce
 #define previous_reduce_module      fallback.reduce.module
 
-#define previous_gather             fallback.gather.gather
+#define previous_gather             fallback.gather.module_fn.gather
 #define previous_gather_module      fallback.gather.module
 
-#define previous_scatter            fallback.scatter.scatter
+#define previous_scatter            fallback.scatter.module_fn.scatter
 #define previous_scatter_module     fallback.scatter.module
 
 
 /* macro to correctly load a fallback collective module */
 #define HAN_LOAD_FALLBACK_COLLECTIVE(HANM, COMM, COLL)                            \
     do {                                                                          \
         if ( ((COMM)->c_coll->coll_ ## COLL ## _module) == (mca_coll_base_module_t*)(HANM) ) { \
-            (COMM)->c_coll->coll_ ## COLL = (HANM)->fallback.COLL.COLL;               \
+            (COMM)->c_coll->coll_ ## COLL = (HANM)->fallback.COLL.module_fn.COLL;               \
             mca_coll_base_module_t *coll_module = (COMM)->c_coll->coll_ ## COLL ## _module; \
             (COMM)->c_coll->coll_ ## COLL ## _module = (HANM)->fallback.COLL.module;  \
             OBJ_RETAIN((COMM)->c_coll->coll_ ## COLL ## _module);                     \

ompi/mca/coll/han/coll_han_module.c

@@ -32,7 +32,7 @@ static int mca_coll_han_module_disable(mca_coll_base_module_t * module,
 
 #define CLEAN_PREV_COLL(HANDLE, NAME)                    \
     do {                                                 \
-        (HANDLE)->fallback.NAME.NAME = NULL;             \
+        (HANDLE)->fallback.NAME.module_fn.NAME = NULL;   \
         (HANDLE)->fallback.NAME.module = NULL;           \
     } while (0)
 

ompi/mca/coll/han/coll_han_subcomms.c

@@ -26,17 +26,17 @@
 #include "coll_han.h"
 #include "coll_han_dynamic.h"
 
-#define HAN_SUBCOM_SAVE_COLLECTIVE(FALLBACKS, COMM, HANM, COLL)          \
+#define HAN_SUBCOM_SAVE_COLLECTIVE(FALLBACKS, COMM, HANM, COLL)                  \
     do {                                                                         \
-        (FALLBACKS).COLL.COLL = (COMM)->c_coll->coll_ ## COLL;                   \
+        (FALLBACKS).COLL.module_fn.COLL = (COMM)->c_coll->coll_ ## COLL;         \
         (FALLBACKS).COLL.module = (COMM)->c_coll->coll_ ## COLL ## _module;      \
-        (COMM)->c_coll->coll_ ## COLL = (HANM)->fallback.COLL.COLL;              \
+        (COMM)->c_coll->coll_ ## COLL = (HANM)->fallback.COLL.module_fn.COLL;    \
         (COMM)->c_coll->coll_ ## COLL ## _module = (HANM)->fallback.COLL.module; \
     } while(0)
 
-#define HAN_SUBCOM_LOAD_COLLECTIVE(FALLBACKS, COMM, HANM, COLL)          \
+#define HAN_SUBCOM_LOAD_COLLECTIVE(FALLBACKS, COMM, HANM, COLL)                  \
     do {                                                                         \
-        (COMM)->c_coll->coll_ ## COLL = (FALLBACKS).COLL.COLL;                   \
+        (COMM)->c_coll->coll_ ## COLL = (FALLBACKS).COLL.module_fn.COLL;         \
         (COMM)->c_coll->coll_ ## COLL ## _module = (FALLBACKS).COLL.module;      \
     } while(0)