Skip to content

Commit

Permalink
Fixing mismatched apex_init() declaration
Browse files Browse the repository at this point in the history
  • Loading branch information
khuck committed Feb 26, 2020
1 parent d2648d8 commit 9fbad9e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/apex/apex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1818,16 +1818,16 @@ using namespace apex;

extern "C" {

int apex_init(const char * thread_name, unsigned long int comm_rank,
unsigned long int comm_size) {
int apex_init(const char * thread_name, const uint64_t comm_rank,
const uint64_t comm_size) {
return init(thread_name, comm_rank, comm_size);
}

int apex_init_(unsigned long int comm_rank, unsigned long int comm_size) {
int apex_init_(const uint64_t comm_rank, const uint64_t comm_size) {
return init("FORTRAN thread", comm_rank, comm_size);
}

int apex_init__(unsigned long int comm_rank, unsigned long int comm_size) {
int apex_init__(const uint64_t comm_rank, const uint64_t comm_size) {
return init("FORTRAN thread", comm_rank, comm_size);
}

Expand Down
5 changes: 3 additions & 2 deletions src/apex/apex.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "apex_types.h"
#include "apex_export.h"
#include "stdbool.h"
#include "stdint.h"

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -53,8 +54,8 @@ extern "C" {
\return APEX_NOERROR on success, or APEX_ERROR on failure.
\sa @ref apex_finalize
*/
APEX_EXPORT int apex_init(const char * thread_name, const unsigned int
comm_rank, const unsigned int comm_size);
APEX_EXPORT int apex_init(const char * thread_name, const uint64_t comm_rank,
const uint64_t comm_size);

/**
\brief Dump output from APEX.
Expand Down

0 comments on commit 9fbad9e

Please sign in to comment.