From 0251030d7302f6c93fb6d9c22a62cbed5ad2c372 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 20 Jan 2010 13:05:42 +0000
Subject: [PATCH] bug 1362: fixed cnproc gnu build
---
RTCP/CNProc/src/LocationInfo.cc | 5 +++++
RTCP/CNProc/src/LocationInfo.h | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/RTCP/CNProc/src/LocationInfo.cc b/RTCP/CNProc/src/LocationInfo.cc
index 67289419167..5de3d61e9d3 100644
--- a/RTCP/CNProc/src/LocationInfo.cc
+++ b/RTCP/CNProc/src/LocationInfo.cc
@@ -93,6 +93,11 @@ void LocationInfo::print() const
#else
+unsigned LocationInfo::remapOnTree(unsigned pset, unsigned core) const
+{
+ return core; // or pset?
+}
+
void LocationInfo::print() const
{
}
diff --git a/RTCP/CNProc/src/LocationInfo.h b/RTCP/CNProc/src/LocationInfo.h
index 98cff2d77df..5d5e16a2ce6 100644
--- a/RTCP/CNProc/src/LocationInfo.h
+++ b/RTCP/CNProc/src/LocationInfo.h
@@ -3,7 +3,6 @@
#include <vector>
-#if defined HAVE_BGP
#if defined HAVE_MPI
// we do not need mpi.h here, but including it after bgp_personality.h leads
// to compilation errors
@@ -11,6 +10,7 @@
#include <mpi.h>
#endif // HAVE_MPI
+#if defined HAVE_BGP
#include <common/bgp_personality.h>
#endif // HAVE_BGP
@@ -23,9 +23,7 @@ class LocationInfo
public:
LocationInfo();
-#if defined HAVE_BGP
unsigned remapOnTree(unsigned pset, unsigned core) const;
-#endif
void print() const;
--
GitLab