Reorganize to allow c++ in internal headers

Author: Matthew-Whitlock

include/fenix.h

@@ -63,8 +63,10 @@
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
+
+
 #include "fenix_data_subset.h"
-#include "fenix_process_recovery.h"
+#include "fenix_init.h"
 
 /**
  * @file

include/fenix_comm_list.h renamed to include/fenix_comm_list.hpp

@@ -56,18 +56,21 @@
 #ifndef __FENIX_DATA_GROUP_H__
 #define __FENIX_DATA_GROUP_H__
 
+#include <vector>
+
 #include <mpi.h>
 #include "fenix.h"
-#include "fenix_data_member.h"
-#include "fenix_data_packet.h"
-#include "fenix_util.h"
+#include "fenix_data_member.hpp"
+#include "fenix_data_packet.hpp"
+#include "fenix_util.hpp"
 #include "fenix_data_subset.h"
 
 #define __FENIX_DEFAULT_GROUP_SIZE 32
 
 typedef struct __fenix_group_vtbl fenix_group_vtbl_t;
 typedef struct __fenix_group fenix_group_t;
 
+
 //This defines the functions which must be implemented by the group
 typedef struct __fenix_group_vtbl {
    int (*group_delete)(fenix_group_t* group);
@@ -165,7 +168,7 @@ void __fenix_data_recovery_reinit( fenix_data_recovery_t *dr, fenix_two_containe
 
 void __fenix_ensure_data_recovery_capacity( fenix_data_recovery_t *dr);
 
-int __fenix_search_groupid( int key, fenix_data_recovery_t *dr );
+int __fenix_search_groupid( int key, fenix_data_recovery_t *dr);
 
 int __fenix_find_next_group_position( fenix_data_recovery_t *dr );
 

include/fenix_data_group.h renamed to include/fenix_data_group.hpp

@@ -57,8 +57,8 @@
 #define __FENIX_DATA_MEMBER_H__
 
 #include <mpi.h>
-#include "fenix_data_packet.h"
-#include "fenix_util.h"
+#include "fenix_data_packet.hpp"
+#include "fenix_util.hpp"
 
 
 #define __FENIX_DEFAULT_MEMBER_SIZE 512

include/fenix_data_member.h renamed to include/fenix_data_member.hpp

@@ -59,7 +59,7 @@
 
 #include <mpi.h>
 #include "fenix.h"
-#include "fenix_data_group.h"
+#include "fenix_data_group.hpp"
 
 int __fenix_policy_get_group(fenix_group_t** group, MPI_Comm comm, 
       int timestart, int depth, int policy_name, void* policy_value, int* flag);

include/fenix_data_packet.h renamed to include/fenix_data_packet.hpp

@@ -58,7 +58,7 @@
 #define __FENIX_DATA_POLICY_IN_MEMORY_RAID_H__
 
 #include <mpi.h>
-#include "fenix_data_group.h"
+#include "fenix_data_group.hpp"
 
 void __fenix_policy_in_memory_raid_get_group(fenix_group_t** group, MPI_Comm comm, 
       int timestart, int depth, void* policy_value, int* flag);

include/fenix_data_policy.h renamed to include/fenix_data_policy.hpp

@@ -58,10 +58,10 @@
 #define __FENIX_DATA_RECOVERY__
 
 
-#include "fenix_data_group.h"
-#include "fenix_data_member.h"
+#include "fenix_data_group.hpp"
+#include "fenix_data_member.hpp"
 #include "fenix_data_subset.h"
-#include "fenix_util.h"
+#include "fenix_util.hpp"
 #include <mpi.h>
 #include <stdio.h>
 #include <stdlib.h>

include/fenix_data_policy_in_memory_raid.h renamed to include/fenix_data_policy_in_memory_raid.hpp

@@ -59,9 +59,9 @@
 
 #include <mpi.h>
 #include "fenix.h"
-#include "fenix_opt.h"
-#include "fenix_data_group.h"
-#include "fenix_process_recovery.h"
+#include "fenix_opt.hpp"
+#include "fenix_data_group.hpp"
+#include "fenix_process_recovery.hpp"
 
 typedef struct {
     int num_inital_ranks;     // Keeps the global MPI rank ID at Fenix_init
@@ -87,7 +87,6 @@ typedef struct {
     int *ret_error;
 
     fenix_callback_list_t* callback_list;  // singly linked list for user-defined Fenix callback functions
-    //fenix_communicator_list_t* communicator_list;  // singly linked list for Fenix resilient communicators
     fenix_debug_opt_t options;    // This is reserved to store the user options
 
     MPI_Comm *world;                 // Duplicate of the MPI communicator provided by user