From ef1492f4382b5a61e3e37cc3a6fbb32d1e13eee3 Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Wed, 14 Jun 2006 12:27:41 +0000
Subject: [PATCH] BugID: 711 Fixed bug in defining result
---
CEP/BB/BBS/src/MNS/MeqExpr.cc | 2 +-
CEP/BB/BBS/src/MNS/MeqExpr.h | 2 +-
CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqExpr.cc | 2 +-
CEP/BB/BBSKernel/src/MNS/MeqExpr.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CEP/BB/BBS/src/MNS/MeqExpr.cc b/CEP/BB/BBS/src/MNS/MeqExpr.cc
index bd0d29c78ef..2a74f2ee13f 100644
--- a/CEP/BB/BBS/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqExpr.cc
@@ -155,7 +155,7 @@ MeqMatrix MeqExprRep::getResultValue (const vector<const MeqMatrix*>&)
MeqResult MeqExprRep::getResult (const MeqRequest& request)
{
// Calculate the result in a generic way.
- MeqResult result;
+ MeqResult result(request.nspid());
// First evaluate all children and keep their results.
// Also keep the main value.
int nrchild = itsChildren.size();
diff --git a/CEP/BB/BBS/src/MNS/MeqExpr.h b/CEP/BB/BBS/src/MNS/MeqExpr.h
index 2b4723cd17f..2b7f8438120 100644
--- a/CEP/BB/BBS/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBS/src/MNS/MeqExpr.h
@@ -20,7 +20,7 @@
//#
//# $Id$
-#if !defined(MNS_MEQEXPR_H)
+#ifndef MNS_MEQEXPR_H
#define MNS_MEQEXPR_H
// \file
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
index 2b4723cd17f..2b7f8438120 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
@@ -20,7 +20,7 @@
//#
//# $Id$
-#if !defined(MNS_MEQEXPR_H)
+#ifndef MNS_MEQEXPR_H
#define MNS_MEQEXPR_H
// \file
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
index bd0d29c78ef..2a74f2ee13f 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
@@ -155,7 +155,7 @@ MeqMatrix MeqExprRep::getResultValue (const vector<const MeqMatrix*>&)
MeqResult MeqExprRep::getResult (const MeqRequest& request)
{
// Calculate the result in a generic way.
- MeqResult result;
+ MeqResult result(request.nspid());
// First evaluate all children and keep their results.
// Also keep the main value.
int nrchild = itsChildren.size();
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
index 2b4723cd17f..2b7f8438120 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
@@ -20,7 +20,7 @@
//#
//# $Id$
-#if !defined(MNS_MEQEXPR_H)
+#ifndef MNS_MEQEXPR_H
#define MNS_MEQEXPR_H
// \file
--
GitLab