official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

don't directly construct shared pointers

This commit is contained in:
Kevin Matz 2021-09-02 13:22:50 -04:00
parent 7f0919f60c
commit b186c949f9
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocols/acn/pdu.h
View File

@ -75,9 +75,7 @@ struct Block
/**
* @brief member Messages of this block
*/
std::shared_ptr<std::vector<Message<T>>> pdu
= std::shared_ptr<std::vector<Message<T>>>
(new std::vector<Message<T>>);
std::shared_ptr<std::vector<Message<T>>> pdu = std::make_shared<std::vector<Message<T>>>();
/**
* @brief setParent
* @param parent

6
protocols/otp/advertisement.cpp
View File

@ -216,13 +216,13 @@ void pdu::iStream(PDU::Stream stream)
switch (vector)
{
case VECTOR_OTP_ADVERTISEMENT_MODULE:
d->payload = std::shared_ptr<Module::pdu>(new Module::pdu());
d->payload = std::make_shared<Module::pdu>();
break;
case VECTOR_OTP_ADVERTISEMENT_NAME:
d->payload = std::shared_ptr<Name::pdu>(new Name::pdu());
d->payload = std::make_shared<Name::pdu>();
break;
case VECTOR_OTP_ADVERTISEMENT_SYSTEM:
d->payload = std::shared_ptr<System::pdu>(new System::pdu());
d->payload = std::make_shared<System::pdu>();
break;
default:
return;

4
protocols/otp/base.cpp
View File

@ -137,11 +137,11 @@ void pdu::iStream(PDU::Stream stream)
switch (vector)
{
case VECTOR_OTP_TRANSFORM_MESSAGE:
d->payload = std::shared_ptr<Transform::pdu>(new Transform::pdu());
d->payload = std::make_shared<Transform::pdu>();
d->payload->iStream(stream_);
break;
case VECTOR_OTP_ADVERTISEMENT_MESSAGE:
d->payload = std::shared_ptr<Advertisement::pdu>(new Advertisement::pdu());
d->payload = std::make_shared<Advertisement::pdu>();
d->payload->iStream(stream_);
break;
}

3
protocols/otp/pdu.h
View File

@ -58,8 +58,7 @@ struct Block
* @brief Messages contained in the block
*/
std::shared_ptr<std::vector<std::shared_ptr<T>>> members
= std::shared_ptr<std::vector<std::shared_ptr<T>>>
(new std::vector<std::shared_ptr<T>>);
= std::make_shared<std::vector<std::shared_ptr<T>>>();
/**
* @brief setParent
* @param parent

6
protocols/rpt/rpt.cpp
View File

@ -248,13 +248,13 @@ void Pdu::iStream(ACN::PDU::Stream stream)
switch (vector())
{
case VECTOR_RPT_REQUEST:
data->pdu = std::shared_ptr<REQUEST::Pdu>(new REQUEST::Pdu());
data->pdu = std::make_shared<REQUEST::Pdu>();
break;
case VECTOR_RPT_STATUS:
data->pdu = std::shared_ptr<STATUS::Pdu>(new STATUS::Pdu());
data->pdu = std::make_shared<STATUS::Pdu>();
break;
case VECTOR_RPT_NOTIFICATION:
data->pdu = std::shared_ptr<NOTIFICATION::Pdu>(new NOTIFICATION::Pdu());
data->pdu = std::make_shared<NOTIFICATION::Pdu>();
break;
default:
return;