From b6a8168e3fd1e9805e4c8620a7639767b6b1c5d0 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Thu, 10 May 2018 00:02:12 -0400
Subject: [PATCH] fix bug in procmap Comm::MULTIPLE import
---
src/comm.h | 3 ++-
src/procmap.cpp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/comm.h b/src/comm.h
index 608099227b..4303d71628 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -133,12 +133,13 @@ class Comm : protected Pointers {
int otherflag; // 1 if this partition dependent on another
int other_style; // style of dependency
- enum{MULTIPLE};
int other_procgrid[3]; // proc layout of another partition
int other_coregrid[3]; // core layout of another partition
int ncores; // # of cores per node
int coregrid[3]; // 3d grid of cores within a node
int user_coregrid[3]; // user request for cores in each dim
+ public:
+ enum{MULTIPLE};
};
}
diff --git a/src/procmap.cpp b/src/procmap.cpp
index 71f63276db..9d1ed83e73 100644
--- a/src/procmap.cpp
+++ b/src/procmap.cpp
@@ -17,6 +17,7 @@
#include "procmap.h"
#include "universe.h"
+#include "comm.h"
#include "domain.h"
#include "math_extra.h"
#include "memory.h"
--
GitLab