From 70aed474dc3230609578cbacaae8d268904179e7 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Date: Fri, 20 May 2022 12:00:24 +0200 Subject: [PATCH] fedora cant compile as make_unique in Implementation points to std and not sls namespace, but it compiles for DetectorImpl (#463) --- slsReceiverSoftware/src/Implementation.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 1d0882df6..97c3719e2 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -75,7 +75,7 @@ void Implementation::SetupFifoStructure() { // create fifo structure try { - fifo.push_back(make_unique( + fifo.push_back(sls::make_unique( i, datasize + (generalData->fifoBufferHeaderSize), fifoDepth)); } catch (...) { fifo.clear(); @@ -178,7 +178,7 @@ void Implementation::setDetectorType(const detectorType d) { try { auto fifo_ptr = fifo[i].get(); - listener.push_back(make_unique( + listener.push_back(sls::make_unique( i, detType, fifo_ptr, &status, &udpPortNum[i], ð[i], &udpSocketBufferSize, &actualUDPSocketBufferSize, &framesPerFile, &frameDiscardMode, &detectorDataStream[i], @@ -187,7 +187,7 @@ void Implementation::setDetectorType(const detectorType d) { if (detType == CHIPTESTBOARD) { ctbAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes(); } - dataProcessor.push_back(make_unique( + dataProcessor.push_back(sls::make_unique( i, detType, fifo_ptr, &dataStreamEnable, &streamingFrequency, &streamingTimerInMs, &streamingStartFnum, &framePadding, &ctbDbitList, &ctbDbitOffset, &ctbAnalogDataBytes)); @@ -996,7 +996,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) { // listener and dataprocessor threads try { auto fifo_ptr = fifo[i].get(); - listener.push_back(make_unique( + listener.push_back(sls::make_unique( i, detType, fifo_ptr, &status, &udpPortNum[i], ð[i], &udpSocketBufferSize, &actualUDPSocketBufferSize, &framesPerFile, &frameDiscardMode, &detectorDataStream[i], @@ -1009,7 +1009,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) { ctbAnalogDataBytes = generalData->GetNumberOfAnalogDatabytes(); } - dataProcessor.push_back(make_unique( + dataProcessor.push_back(sls::make_unique( i, detType, fifo_ptr, &dataStreamEnable, &streamingFrequency, &streamingTimerInMs, &streamingStartFnum, &framePadding, &ctbDbitList, @@ -1031,7 +1031,7 @@ void Implementation::setNumberofUDPInterfaces(const int n) { if (quadEnable) { flip = (i == 1 ? true : false); } - dataStreamer.push_back(make_unique( + dataStreamer.push_back(sls::make_unique( i, fifo[i].get(), &dynamicRange, &detectorRoi, &fileIndex, flip, numPorts, &quadEnable, &numberOfTotalFrames)); @@ -1158,7 +1158,7 @@ void Implementation::setDataStreamEnable(const bool enable) { if (quadEnable) { flip = (i == 1 ? true : false); } - dataStreamer.push_back(make_unique( + dataStreamer.push_back(sls::make_unique( i, fifo[i].get(), &dynamicRange, &detectorRoi, &fileIndex, flip, numPorts, &quadEnable, &numberOfTotalFrames));