From 616f1cbf78650a61592b2b3c870753211e2dd697 Mon Sep 17 00:00:00 2001 From: Hugo Jean Ponsin Date: Thu, 30 Apr 2026 16:54:34 +0200 Subject: [PATCH] adding new version of mepicsca and using unique ptr --- src/device/ePowerSwitchEquipment.cpp | 10 ++++------ src/device/ePowerSwitchEquipment.h | 4 ++-- submodule/mepicsca | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/device/ePowerSwitchEquipment.cpp b/src/device/ePowerSwitchEquipment.cpp index 42ff785..dbd29ea 100644 --- a/src/device/ePowerSwitchEquipment.cpp +++ b/src/device/ePowerSwitchEquipment.cpp @@ -123,12 +123,14 @@ void ePowerSwitchEquipment::updateSocketNumber() { format(EPOWERSWITCH_SOCKET_SET_PREFIX, i); this->outletSetRecords.push_back( - new mEpicsCa(epicsSetRecordName.c_str())); + std::make_unique>( + epicsSetRecordName.c_str())); std::string epicsGetRecordName = format(EPOWERSWITCH_SOCKET_GET_PREFIX, i); this->outletGetRecords.push_back( - new mEpicsCa(epicsGetRecordName.c_str())); + std::make_unique>( + epicsGetRecordName.c_str())); } if (this->numberOfOutlet > epicsOutletNumber) @@ -137,10 +139,6 @@ void ePowerSwitchEquipment::updateSocketNumber() { this->numberOfOutlet - epicsOutletNumber); for (int i = epicsOutletNumber; i < this->numberOfOutlet; i++) { - mEpicsCa *setRecord = this->outletSetRecords.back(); - delete setRecord; - mEpicsCa *getRecord = this->outletGetRecords.back(); - delete getRecord; std::string requestedVarname = format("Socket ", i) + std::string(" requested"); diff --git a/src/device/ePowerSwitchEquipment.h b/src/device/ePowerSwitchEquipment.h index 651732f..751a4ef 100644 --- a/src/device/ePowerSwitchEquipment.h +++ b/src/device/ePowerSwitchEquipment.h @@ -23,8 +23,8 @@ class ePowerSwitchEquipment : public TMFeEquipment { void HandlePeriodic(); private: - std::vector *> outletSetRecords; - std::vector *> outletGetRecords; + std::vector>> outletSetRecords; + std::vector>> outletGetRecords; mEpicsCa outletNumberRecord; int numberOfOutlet; diff --git a/submodule/mepicsca b/submodule/mepicsca index abc5781..419df88 160000 --- a/submodule/mepicsca +++ b/submodule/mepicsca @@ -1 +1 @@ -Subproject commit abc57815eb9992d489d30fd315f93ded52ebc5a0 +Subproject commit 419df88dde85d8dc3150c7632c4214950b92c881