From 949c6a81ce59eca6f23b5e07f792b2fe6b6127ea Mon Sep 17 00:00:00 2001
From: Erik Frojdh <erik.frojdh@gmail.com>
Date: Wed, 5 Aug 2020 13:54:56 +0200
Subject: [PATCH] vector to array

---
 slsReceiverSoftware/src/Implementation.cpp | 17 -----------------
 slsReceiverSoftware/src/Implementation.h   |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp
index 9493eaaff..d1778d2f3 100644
--- a/slsReceiverSoftware/src/Implementation.cpp
+++ b/slsReceiverSoftware/src/Implementation.cpp
@@ -23,29 +23,12 @@
 /** cosntructor & destructor */
 
 Implementation::Implementation(const detectorType d) {
-
-    // network configuration (UDP)
-    eth.resize(MAX_NUMBER_OF_LISTENING_THREADS);
-    udpPortNum.resize(MAX_NUMBER_OF_LISTENING_THREADS);
-    for (int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; ++i) {
-        udpPortNum[i] = DEFAULT_UDP_PORTNO + i;
-    }
-
     setDetectorType(d);
 }
 
 Implementation::~Implementation() {
     delete generalData;
     generalData = nullptr;
-    additionalJsonHeader.clear();
-    listener.clear();
-    dataProcessor.clear();
-    dataStreamer.clear();
-    fifo.clear();
-    eth.clear();
-    udpPortNum.clear();
-    rateCorrections.clear();
-    ctbDbitList.clear();
 }
 
 void Implementation::SetLocalNetworkParameters() {
diff --git a/slsReceiverSoftware/src/Implementation.h b/slsReceiverSoftware/src/Implementation.h
index 890f9634e..f80290b26 100644
--- a/slsReceiverSoftware/src/Implementation.h
+++ b/slsReceiverSoftware/src/Implementation.h
@@ -295,8 +295,8 @@ class Implementation : private virtual slsDetectorDefs {
 
     // network configuration (UDP)
     int numUDPInterfaces{1};
-    std::vector<std::string> eth;     //(MAX_NUMBER_OF_LISTENING_THREADS);
-    std::vector<uint32_t> udpPortNum; //(MAX_NUMBER_OF_LISTENING_THREADS);
+    std::array<std::string,MAX_NUMBER_OF_LISTENING_THREADS>eth;
+    std::array<uint32_t,MAX_NUMBER_OF_LISTENING_THREADS> udpPortNum{DEFAULT_UDP_PORTNO, DEFAULT_UDP_PORTNO+1};
     int64_t udpSocketBufferSize{0};
     int64_t actualUDPSocketBufferSize{0};