Skip to content

Commit f98f83b

Browse files
Merge pull request #86 from sandialabs/compiler-error-fixes
Small compile fix and API match
2 parents 06f2085 + 2fe5aab commit f98f83b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/fenix.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,8 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
547547

548548
//!@unimplemented As #Fenix_Data_member_restore, but restores from a specific rank's data.
549549
int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *data,
550-
int max_count, int time_stamp, int group_id,
551-
int source_rank);
550+
int max_count, int time_stamp,
551+
Fenix_Data_subset* found_data, int source_rank);
552552

553553
/**
554554
* @brief Create a data subset for use in store operations.

src/fenix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ int Fenix_Data_member_lrestore(int group_id, int member_id, void *target_buffer,
138138
return __fenix_member_lrestore(group_id, member_id, target_buffer, max_count, time_stamp, data_found);
139139
}
140140

141-
int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, int source_rank) {
141+
int Fenix_Data_member_restore_from_rank(int group_id, int member_id, void *target_buffer, int max_count, int time_stamp, Fenix_Data_subset* data_found, int source_rank) {
142142
return 0;
143143
}
144144

src/fenix_data_recovery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,8 +920,8 @@ int __fenix_member_set_attribute(int groupid, int memberid, int attributename,
920920

921921
if( myerr ) {
922922
debug_print(
923-
"ERROR Fenix_Data_member_attr_get: Fenix currently does not support this MPI_DATATYPE; invalid attribute_value <%d>\n",
924-
attributevalue);
923+
"ERROR Fenix_Data_member_attr_get: Fenix currently does not support this MPI_DATATYPE; error %d\n", myerr
924+
);
925925
retval = FENIX_ERROR_INVALID_ATTRIBUTE_NAME;
926926
}
927927

0 commit comments

Comments
 (0)