From f5cf4a6e8807e8b45cba7c8f955775b5c35bf0fe Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Tue, 10 Jul 2012 12:17:57 +0000
Subject: [PATCH] Task #2050: Added missing #include's and missing using
namespace LOFAR.
---
CEP/Calibration/BBSControl/src/bbs-reducer.cc | 1 +
CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc | 1 +
CEP/DP3/DPPP/src/NDPPP.cc | 1 +
CEP/MS/src/combinevds.cc | 1 +
CEP/MS/src/makevds.cc | 1 +
CEP/ParmDB/src/parmexportcal.cc | 1 +
LCS/AMC/AMCImpl/src/WGS84toITRF.cc | 3 ---
MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc | 1 +
MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc | 1 +
MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc | 1 +
MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc | 1 +
MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc | 1 +
MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc | 1 +
MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc | 1 +
.../MainCU/src/ObservationControl/ObservationControlMain.cc | 1 +
MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc | 1 +
MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc | 1 +
.../StationCU/src/CalibrationControl/CalibrationControlMain.cc | 1 +
MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc | 1 +
MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc | 1 +
RTCP/Storage/test/tMeasurementSetFormat.cc | 1 +
21 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/CEP/Calibration/BBSControl/src/bbs-reducer.cc b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
index 09b65500f66..4a621d6e120 100644
--- a/CEP/Calibration/BBSControl/src/bbs-reducer.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-reducer.cc
@@ -37,6 +37,7 @@
#include <Common/LofarLogger.h>
#include <Common/StreamUtil.h>
#include <Common/SystemUtil.h>
+#include <Common/Exception.h>
#ifdef HAVE_PQXX
#include <BBSControl/CalSession.h>
diff --git a/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc b/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
index bb45bf4be43..e26c8834d68 100644
--- a/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
+++ b/CEP/Calibration/BBSControl/src/bbs-shared-estimator.cc
@@ -23,6 +23,7 @@
#include <lofar_config.h>
#include <Common/SystemUtil.h>
+#include <Common/Exception.h>
#include <BBSControl/Package__Version.h>
#include <BBSControl/CalSession.h>
#include <BBSControl/CommandHandlerEstimator.h>
diff --git a/CEP/DP3/DPPP/src/NDPPP.cc b/CEP/DP3/DPPP/src/NDPPP.cc
index 5d33756d992..6c0fe65ae66 100644
--- a/CEP/DP3/DPPP/src/NDPPP.cc
+++ b/CEP/DP3/DPPP/src/NDPPP.cc
@@ -26,6 +26,7 @@
#include <DPPP/Package__Version.h>
#include <Common/LofarLogger.h>
#include <Common/SystemUtil.h>
+#include <Common/Exception.h>
#include <iostream>
#include <stdexcept>
diff --git a/CEP/MS/src/combinevds.cc b/CEP/MS/src/combinevds.cc
index 7ac57bda2fe..7ed34f33655 100644
--- a/CEP/MS/src/combinevds.cc
+++ b/CEP/MS/src/combinevds.cc
@@ -26,6 +26,7 @@
#include <Common/LofarLogger.h>
#include <Common/StringUtil.h>
#include <Common/SystemUtil.h>
+#include <Common/Exception.h>
#include <stdexcept>
#include <iostream>
diff --git a/CEP/MS/src/makevds.cc b/CEP/MS/src/makevds.cc
index 12355a47bd9..18841c8a94b 100644
--- a/CEP/MS/src/makevds.cc
+++ b/CEP/MS/src/makevds.cc
@@ -25,6 +25,7 @@
#include <MS/Package__Version.h>
#include <Common/LofarLogger.h>
#include <Common/SystemUtil.h>
+#include <Common/Exception.h>
#include <stdexcept>
#include <iostream>
diff --git a/CEP/ParmDB/src/parmexportcal.cc b/CEP/ParmDB/src/parmexportcal.cc
index d9b594257d6..7bd43ce0d76 100644
--- a/CEP/ParmDB/src/parmexportcal.cc
+++ b/CEP/ParmDB/src/parmexportcal.cc
@@ -34,6 +34,7 @@
#include <Common/InputParSet.h>
#include <Common/LofarLogger.h>
#include <Common/SystemUtil.h>
+#include <Common/Exception.h>
#include <casa/Quanta/MVTime.h>
#include <casa/Utilities/MUString.h>
diff --git a/LCS/AMC/AMCImpl/src/WGS84toITRF.cc b/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
index 7de23ee1d21..4f99e9bb3f4 100644
--- a/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
+++ b/LCS/AMC/AMCImpl/src/WGS84toITRF.cc
@@ -75,9 +75,6 @@ int main()
pos = conv(pos);
showPos(pos);
}
- } catch (Exception& e) {
- cerr << "LOFAR Exception: " << e << endl;
- return 1;
} catch (exception& e) {
cerr << "Exception: " << e.what() << endl;
return 1;
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
index df9cc9d495e..1a0dadbfb11 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
@@ -28,6 +28,7 @@
using namespace LOFAR::GCF::TM;
using namespace LOFAR::CEPCU;
+using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
index 16c67c5d9ec..38bee7485f3 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
@@ -28,6 +28,7 @@
using namespace LOFAR::GCF::TM;
using namespace LOFAR::CEPCU;
+using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
index 8bc5fdcbe7c..bfb6138b975 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
@@ -26,6 +26,7 @@
#include <Common/Exception.h>
#include "KeyValueLogger.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::RTDBDaemons;
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
index 7c9e2a7dfb1..65cd3c3cedd 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
@@ -26,6 +26,7 @@
#include <Common/Exception.h>
#include "LogProcessor.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::RTDBDaemons;
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
index 57bf6d58a8c..e7c3000739a 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
@@ -26,6 +26,7 @@
#include <Common/Exception.h>
#include "SASGateway.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::GCF::RTDBDaemons;
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
index 1158c2e0eb1..7fd6086d47c 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
@@ -28,6 +28,7 @@
using namespace LOFAR::GCF::TM;
using namespace LOFAR::MainCU;
+using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
index 5c481059bab..5f6b5ab6117 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
@@ -29,6 +29,7 @@
using namespace LOFAR::GCF::TM;
using namespace LOFAR::MainCU;
using namespace LOFAR::APLCommon;
+using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
index 9191d0b3f1c..7c52a1dce68 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
@@ -29,6 +29,7 @@
using namespace LOFAR::GCF::TM;
using namespace LOFAR::MainCU;
using namespace LOFAR::APLCommon;
+using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
index cae1cb0d0b8..9ebfdd718c8 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
@@ -29,6 +29,7 @@
using namespace LOFAR::GCF::TM;
using namespace LOFAR::AMI;
+using namespace LOFAR;
// Use a terminate handler that can produce a backtrace.
Exception::TerminateHandler t(Exception::terminate);
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
index c842e8ec9bf..b6eab6f10ce 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
@@ -25,6 +25,7 @@
#include <Common/Exception.h>
#include "BeamControl.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::StationCU;
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
index 0d2db572780..d6f05db5fba 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
@@ -25,6 +25,7 @@
#include <Common/Exception.h>
#include "CalibrationControl.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::StationCU;
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
index 8c0d8722719..23e3a6158a5 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
@@ -26,6 +26,7 @@
#include "ClockControl.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::StationCU;
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
index e1efb83bb13..8b99850b0e7 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
@@ -25,6 +25,7 @@
#include <Common/Exception.h>
#include "TBBControl.h"
+using namespace LOFAR;
using namespace LOFAR::GCF::TM;
using namespace LOFAR::StationCU;
diff --git a/RTCP/Storage/test/tMeasurementSetFormat.cc b/RTCP/Storage/test/tMeasurementSetFormat.cc
index 2180a6423f5..12438c7b36e 100644
--- a/RTCP/Storage/test/tMeasurementSetFormat.cc
+++ b/RTCP/Storage/test/tMeasurementSetFormat.cc
@@ -9,6 +9,7 @@
#include <lofar_config.h>
#include <Storage/MeasurementSetFormat.h>
#include <Common/LofarLogger.h>
+#include <Common/Exception.h>
#include <casa/IO/RegularFileIO.h>
--
GitLab