Commit 60ee3655 authored by Shane Snyder's avatar Shane Snyder
Browse files

Merge branch 'fix-include-mpi-cxx' into 'ssg-interface-rewrite'

includes must be before the extern "C" otherwise you get compilation errors in C++

See merge request !4
parents 7bbf904e fad388be
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
#pragma once #pragma once
#include <mpi.h>
#include <ssg.h>
/** /**
* Scalable Service Groups (SSG) interface * Scalable Service Groups (SSG) interface
* *
...@@ -16,9 +19,6 @@ ...@@ -16,9 +19,6 @@
extern "C" { extern "C" {
#endif #endif
#include <mpi.h>
#include <ssg.h>
/** /**
* Creates an SSG group from a given MPI communicator. * Creates an SSG group from a given MPI communicator.
* *
......
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
#pragma once #pragma once
#include <mercury.h>
#include <margo.h>
/** /**
* Scalable Service Groups (SSG) interface * Scalable Service Groups (SSG) interface
* *
...@@ -17,9 +20,6 @@ ...@@ -17,9 +20,6 @@
extern "C" { extern "C" {
#endif #endif
#include <mercury.h>
#include <margo.h>
/* SSG return codes */ /* SSG return codes */
#define SSG_SUCCESS 0 #define SSG_SUCCESS 0
#define SSG_FAILURE (-1) #define SSG_FAILURE (-1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment