Skip to content

Decorator: move CsProtocol::Value temporaries into ext maps instead of copying #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmehta001 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Decorator: move CsProtocol::Value temporaries into ext maps instead of copying #1498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcf5bb1
Decorator: move CsProtocol::Value temporaries into the ext maps
bmehta001 Jun 23, 2026
faca448
Address Copilot comment: include <utility> for std::move
bmehta001 Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions lib/decorators/EventPropertiesDecorator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <algorithm>
#include <map>
#include <string>
#include <utility>

namespace MAT_NS_BEGIN {

Expand Down Expand Up @@ -187,11 +188,11 @@ namespace MAT_NS_BEGIN {
temp.stringValue = v.to_string();
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
Comment on lines 189 to 196

}
Expand All @@ -209,11 +210,11 @@ namespace MAT_NS_BEGIN {
temp.stringValue = v.to_string();
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
#if 0 /* v2 code */
if (v.piiKind != PiiKind_None)
Expand Down Expand Up @@ -251,11 +252,11 @@ namespace MAT_NS_BEGIN {
temp.stringValue = v.to_string();
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -266,11 +267,11 @@ namespace MAT_NS_BEGIN {
temp.longValue = v.as_int64;
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -281,11 +282,11 @@ namespace MAT_NS_BEGIN {
temp.doubleValue = v.as_double;
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -296,11 +297,11 @@ namespace MAT_NS_BEGIN {
temp.longValue = v.as_time_ticks.ticks;
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -311,11 +312,11 @@ namespace MAT_NS_BEGIN {
temp.longValue = v.as_bool;
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand Down Expand Up @@ -345,11 +346,11 @@ namespace MAT_NS_BEGIN {
temp.longArray.push_back(*v.as_longArray);
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -360,11 +361,11 @@ namespace MAT_NS_BEGIN {
temp.doubleArray.push_back(*v.as_doubleArray);
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -375,11 +376,11 @@ namespace MAT_NS_BEGIN {
temp.stringArray.push_back(*v.as_stringArray);
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -398,11 +399,11 @@ namespace MAT_NS_BEGIN {
temp.guidArray.push_back(values);
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
break;
}
Expand All @@ -413,11 +414,11 @@ namespace MAT_NS_BEGIN {
temp.stringValue = v.to_string();
if (v.dataCategory == DataCategory_PartB)
{
extPartB[k] = temp;
extPartB[k] = std::move(temp);
}
else
{
ext[k] = temp;
ext[k] = std::move(temp);
}
}
}
Expand All @@ -427,8 +428,8 @@ namespace MAT_NS_BEGIN {
if (extPartB.size() > 0)
{
::CsProtocol::Data partBdata;
partBdata.properties = extPartB;
record.baseData.push_back(partBdata);
partBdata.properties = std::move(extPartB);
record.baseData.push_back(std::move(partBdata));
}

// special case of CorrelationVector value
Expand Down
Loading