From 34799ec6ba3ba22cee7ce0f40f8796fb91b876bc Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Fri, 21 Mar 2008 08:45:32 +0000
Subject: [PATCH] Bug 1167: Cleaned up MAC layers. There are less dependancies
between the packages now.
---
MAC/APL/CEPCU/configure.in | 3 ++-
MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc | 3 +--
MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc | 4 ++--
MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
index d4eed17c883..d1c870ba85f 100644
--- a/MAC/APL/CEPCU/configure.in
+++ b/MAC/APL/CEPCU/configure.in
@@ -57,10 +57,11 @@ lofar_COMPILETOOLS
lofar_PVSS(1)
lofar_INTERNAL(LCS/Common, common,, 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/ACC/APS, aps,, 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(ApplCommon, applcommon,, 1, ApplCommon/Observation.h,,)
lofar_INTERNAL(LCS/ACC/ALC, alc,, 1, ALC/ApplControl.h,,)
lofar_INTERNAL(LCS/ACC/PLC, plc,, 1, PLC/PCCmd.h,,)
dnl lofar_INTERNAL(SAS/OTDB, otdb, , 1, OTDB/OTDBconnection.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
lofar_INTERNAL(MAC/GCF/RTDB, rtdb, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
diff --git a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc
index 5fad389c5b9..2b2c95d971c 100644
--- a/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc
+++ b/MAC/APL/CEPCU/src/OfflineControl/OfflineControl.cc
@@ -28,7 +28,7 @@
#include <GCF/GCF_PVTypes.h>
#include <GCF/PAL/GCF_PVSSInfo.h>
#include <GCF/Utils.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <GCF/Protocols/PA_Protocol.ph>
#include <APL/APLCommon/APL_Defines.h>
#include <APL/APLCommon/APLUtilities.h>
@@ -40,7 +40,6 @@
#include "OfflineControl.h"
#include "OfflineControlDefines.h"
-using namespace LOFAR::GCF::Common;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PAL;
using namespace std;
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index fc2daad793d..7db31bfe085 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -29,8 +29,8 @@
#include <APS/ParameterSet.h>
#include <APS/Exceptions.h>
#include <GCF/PVSS/GCF_PVTypes.h>
-#include <GCF/Utils.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <Common/SystemUtil.h>
+#include <MACIO/MACServiceInfo.h>
#include <GCF/TM/GCF_Protocols.h>
#include <APL/APLCommon/APL_Defines.h>
#include <APL/APLCommon/APLUtilities.h>
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
index 2c9aea500a6..f9dd572fb0a 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
@@ -48,10 +48,10 @@
namespace LOFAR {
namespace CEPCU {
+using MACIO::GCFEvent;
using GCF::TM::GCFTimerPort;
using GCF::TM::GCFITCPort;
using GCF::TM::GCFPort;
-using GCF::TM::GCFEvent;
using GCF::TM::GCFPortInterface;
using GCF::TM::GCFTask;
using GCF::RTDB::RTDBPropertySet;
--
GitLab