From a092a61e17714141059d9e9311c0e3fe5ff82df4 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 22 Jan 2010 09:14:52 +0000
Subject: [PATCH] Bug 1448: Fixed remaining MAC sources, so that they also
compile with the new package-version structure
---
MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc | 2 +-
MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc | 2 +-
MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc | 2 +-
.../CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc | 2 +-
MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc | 2 +-
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc | 2 +-
MAC/APL/StationCU/src/BeamControl/BeamControl.cc | 2 +-
MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc | 2 +-
MAC/APL/StationCU/src/ClockControl/ClockControl.cc | 2 +-
MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc | 2 +-
MAC/APL/StationCU/src/StationControl/StationControl.cc | 2 +-
MAC/APL/StationCU/src/TBBControl/TBBControl.cc | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index 5e2497d827e..58e3f6ab9e1 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
@@ -31,7 +31,7 @@
#include <GCF/PVSS/PVSSresult.h>
#include <GCF/RTDB/DP_Protocol.ph>
#include "KeyValueLogger.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
namespace LOFAR {
using namespace MACIO;
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
index 50984d344de..cd1f19a9626 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
@@ -32,7 +32,7 @@
#include <GCF/RTDB/DP_Protocol.ph>
#include <log4cplus/socketappender.h>
#include "LogProcessor.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
using namespace log4cplus;
using namespace log4cplus::helpers;
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
index 1be5baf92a2..e5d22c19c22 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
@@ -35,7 +35,7 @@
#include <OTDB/TreeTypeConv.h>
#include <OTDB/TreeValue.h>
#include "SASGateway.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
namespace LOFAR {
using namespace MACIO;
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
index 01485d93388..ff5e5c53dda 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
@@ -27,7 +27,7 @@
#include <GCF/RTDB/DP_Protocol.ph>
#include "SoftwareMonitor.h"
-#include "../Package__Version.h"
+#include <CURTDBDaemons/Package__Version.h>
using namespace LOFAR;
using namespace LOFAR::GCF;
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 910ac3044ce..41be0483f13 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -39,7 +39,7 @@
#include "MACScheduler.h"
#include "PVSSDatapointDefs.h"
-#include "../Package__Version.h"
+#include <MainCU/Package__Version.h>
using namespace LOFAR::GCF::PVSS;
using namespace LOFAR::GCF::TM;
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index c296fa1993f..b095208b69a 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -39,7 +39,7 @@
#include "ObservationControl.h"
#include "PVSSDatapointDefs.h"
-#include "../Package__Version.h"
+#include <MainCU/Package__Version.h>
namespace LOFAR {
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index acfdfdc3602..711a2614245 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -39,7 +39,7 @@
#include "BeamControl.h"
#include "PVSSDatapointDefs.h"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index aecc207dcb9..a67b663899c 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -36,7 +36,7 @@
#include "CalibrationControl.h"
#include "PVSSDatapointDefs.h"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
index f810ac03812..bc5ead630a8 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
@@ -38,7 +38,7 @@
#include "ClockControl.h"
#include "PVSSDatapointDefs.h"
#include "Clock_Protocol.ph"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
index a3a630aeff6..3ea35f5a162 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
@@ -30,7 +30,7 @@
#include "RSPMonitor.h"
#include "TBBMonitor.h"
#include "ECMonitor.h"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
using namespace LOFAR;
using namespace LOFAR::GCF;
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 4d0f82e1655..7fc0f2fbc94 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -49,7 +49,7 @@
#include "StationControl.h"
#include "PVSSDatapointDefs.h"
#include "Clock_Protocol.ph"
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
index e655a9bc89b..4722a4b364c 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
@@ -38,7 +38,7 @@
#include <GCF/RTDB/DP_Protocol.ph>
#include <signal.h>
#include <APL/RTCCommon/Timestamp.h>
-#include <APL/ClockProtocol/Package__Version.h>
+#include <StationCU/Package__Version.h>
//# local includes
#include <VHECR/TBBTrigger.h>
--
GitLab