From 2a220cdad8309b807857fa22b7fbd6cb51dbad4a Mon Sep 17 00:00:00 2001
From: blaakmeer <sdos@astron.nl>
Date: Thu, 20 Oct 2005 13:42:12 +0000
Subject: [PATCH] BugID: 366 APLCommon enums moved from protocol file to
APL_Defines.h header file
---
MAC/APL/_GSO/MACScheduler/configure.in | 2 +-
MAC/APL/_GSO/MACScheduler/src/MACScheduler.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MAC/APL/_GSO/MACScheduler/configure.in b/MAC/APL/_GSO/MACScheduler/configure.in
index 616c83318ac..3ee9e575200 100644
--- a/MAC/APL/_GSO/MACScheduler/configure.in
+++ b/MAC/APL/_GSO/MACScheduler/configure.in
@@ -5,7 +5,7 @@ AC_INIT
dnl AC_CONFIG_AUX_DIR(config)
dnl AM_CONFIG_HEADER(config/config.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MACScheduler, 3.1)
+AM_INIT_AUTOMAKE(MACScheduler, 3.1, no-define)
dnl
dnl Initialize for LOFAR (may set compilers)
diff --git a/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h b/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h
index 94b46bd1375..553d3d9b0fc 100644
--- a/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h
+++ b/MAC/APL/_GSO/MACScheduler/src/MACScheduler.h
@@ -143,8 +143,8 @@ namespace GSO
string _getVInameFromPort(const GCF::TM::GCFPortInterface& port) const;
string _getShareLocation() const;
void _handleSASprotocol(GCF::TM::GCFEvent& event, GCF::TM::GCFPortInterface& port);
- TSASResult _LDtoSASresult(const TLDResult& ldResult);
- TSASResult _SDtoSASresult(const TSDResult& sdResult);
+ TSASResult _LDtoSASresult(const APLCommon::TLDResult& ldResult);
+ TSASResult _SDtoSASresult(const APLCommon::TSDResult& sdResult);
void _convertRelativeTimes(boost::shared_ptr<ACC::APS::ParameterSet> ps);
void _convertRelativeTimesChild(string child, boost::shared_ptr<ACC::APS::ParameterSet> ps);
--
GitLab