From 1ceb902606855bbc20dd61ea47a860bfd44c7d20 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 5 Sep 2012 08:07:28 +0000
Subject: [PATCH] Task #1418: Fixed compiler warnings
---
MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc | 1 +
MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc | 4 ++--
MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc | 4 ++--
MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc | 4 +++-
MAC/APL/RTCCommon/test/tBlitz.cc | 4 +++-
MAC/APL/RTCCommon/test/tMarshallBlitz.cc | 4 +++-
MAC/APL/RTCCommon/test/tNsTimestamp.cc | 4 +++-
MAC/APL/RTCCommon/test/tTimestamp.cc | 4 +++-
8 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
index 6ea221dac18..78eadbf4b7e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
@@ -204,6 +204,7 @@ RSPDriver::RSPDriver(string name) :
RCUCables* cables = new RCUCables("Attenuation.conf", "CableDelays.conf");
CableSettings* cableSet = new CableSettings(cables);
delete cables;
+ (void)cableSet; // prevent compiler warning
LOG_DEBUG("Trying to load delay settings for synchronising the PPS between the subracks");
readPPSdelaySettings();
diff --git a/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
index bef0760cbb1..c713949a6f7 100644
--- a/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
@@ -32,9 +32,9 @@
using namespace LOFAR;
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
- INIT_LOGGER("tCableAttenuation");
+ INIT_LOGGER(argv[0]);
// good file
CableAttenuation CA1("tCableAttenuation.in_1");
diff --git a/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
index 2721862bd48..77f8040944a 100644
--- a/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
@@ -32,9 +32,9 @@
using namespace LOFAR;
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
- INIT_LOGGER("tRCUCables");
+ INIT_LOGGER(argv[0]);
// good file
RCUCables RC1("tRCUCables.in_CableAtts", "tRCUCables.in_1");
diff --git a/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc b/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
index f0fa60ec4a6..0a34be9429f 100644
--- a/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
@@ -48,8 +48,10 @@ using namespace LOFAR;
using namespace RSP_Protocol;
// main
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
+ INIT_LOGGER(argv[0]);
+
RCUSettings RS;
RS().resize(1);
diff --git a/MAC/APL/RTCCommon/test/tBlitz.cc b/MAC/APL/RTCCommon/test/tBlitz.cc
index bd67240e645..943a329996b 100644
--- a/MAC/APL/RTCCommon/test/tBlitz.cc
+++ b/MAC/APL/RTCCommon/test/tBlitz.cc
@@ -31,8 +31,10 @@
using namespace LOFAR;
using namespace blitz;
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
+ INIT_LOGGER(argv[0]);
+
// test empty blitz array
cout << "Testing 2 dimensional empty blitz array..." << endl;
Array<int,2> emptyArr; // two dimensional empty array.
diff --git a/MAC/APL/RTCCommon/test/tMarshallBlitz.cc b/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
index d675dd70d53..3896de521cc 100644
--- a/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
+++ b/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
@@ -32,8 +32,10 @@
using namespace LOFAR;
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
+ INIT_LOGGER(argv[0]);
+
char buf[4096];
int offset(0);
diff --git a/MAC/APL/RTCCommon/test/tNsTimestamp.cc b/MAC/APL/RTCCommon/test/tNsTimestamp.cc
index a81f87dadf5..e89e1d8cda8 100644
--- a/MAC/APL/RTCCommon/test/tNsTimestamp.cc
+++ b/MAC/APL/RTCCommon/test/tNsTimestamp.cc
@@ -34,8 +34,10 @@
using namespace LOFAR;
using namespace RTC;
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
+ INIT_LOGGER(argv[0]);
+
cout << "\n--- Testing constructors ---" << endl;
NsTimestamp TS1;
cout << "TS1: " << TS1 << endl;
diff --git a/MAC/APL/RTCCommon/test/tTimestamp.cc b/MAC/APL/RTCCommon/test/tTimestamp.cc
index 705c7fa9453..90578b30ac0 100644
--- a/MAC/APL/RTCCommon/test/tTimestamp.cc
+++ b/MAC/APL/RTCCommon/test/tTimestamp.cc
@@ -34,8 +34,10 @@
using namespace LOFAR;
using namespace RTC;
-int main (int argc, char* argv[])
+int main (int, char* argv[])
{
+ INIT_LOGGER(argv[0]);
+
cout << "\n--- Testing constructors ---" << endl;
Timestamp TS1;
cout << "TS1: " << TS1 << endl;
--
GitLab