Skip to content

Rework DCS point classes to have default assign operators #15240

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
ktf wants to merge 2 commits into
base: dev
Choose a base branch
from
+13 −30
Open

Rework DCS point classes to have default assign operators #15240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8859b
Use default constructor
ktf Mar 29, 2026
d170034
Rework DCS point classes to have default assign operators
ktf Mar 29, 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
12 changes: 3 additions & 9 deletions Detectors/DCS/include/DetectorsDCS/DataPointCompositeObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct DataPointCompositeObject final {
*
* @see ADAPRO::ADAPOS::DataPointIdentifier
*/
const DataPointIdentifier id;
DataPointIdentifier id;

/**
* The DataPointValue object, which occupies the last 64 bytes of the
Expand Down Expand Up @@ -83,15 +83,9 @@ struct DataPointCompositeObject final {
/**
* Copy constructor
*/
DataPointCompositeObject(const DataPointCompositeObject& src) noexcept : DataPointCompositeObject(src.id, src.data) {}
DataPointCompositeObject(const DataPointCompositeObject& src) noexcept = default;

DataPointCompositeObject& operator=(const DataPointCompositeObject& src) noexcept
{
if (&src != this) {
memcpy(this, &src, sizeof(DataPointCompositeObject));
}
return *this;
}
DataPointCompositeObject& operator=(const DataPointCompositeObject& src) noexcept = default;

/**
* Bit-by bit equality comparison of DataPointCompositeObjects.
Expand Down
31 changes: 10 additions & 21 deletions Detectors/DCS/include/DetectorsDCS/DataPointIdentifier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,14 @@ namespace dcs
*/
class DataPointIdentifier final
{
const uint64_t pt1;
const uint64_t pt2;
const uint64_t pt3;
const uint64_t pt4;
const uint64_t pt5;
const uint64_t pt6;
const uint64_t pt7;
const uint64_t pt8; // Contains the last 6 chars of alias and the type.

DataPointIdentifier(
const uint64_t pt1, const uint64_t pt2, const uint64_t pt3,
const uint64_t pt4, const uint64_t pt5, const uint64_t pt6,
const uint64_t pt7, const uint64_t pt8) noexcept : pt1(pt1), pt2(pt2), pt3(pt3), pt4(pt4), pt5(pt5), pt6(pt6), pt7(pt7), pt8(pt8) {}
uint64_t pt1;
uint64_t pt2;
uint64_t pt3;
uint64_t pt4;
uint64_t pt5;
uint64_t pt6;
uint64_t pt7;
uint64_t pt8; // Contains the last 6 chars of alias and the type.

public:
/**
Expand Down Expand Up @@ -85,15 +80,9 @@ class DataPointIdentifier final
/**
* A copy constructor for DataPointIdentifier.
*/
DataPointIdentifier(const DataPointIdentifier& src) noexcept : DataPointIdentifier(src.pt1, src.pt2, src.pt3, src.pt4, src.pt5, src.pt6, src.pt7, src.pt8) {}
DataPointIdentifier(const DataPointIdentifier& src) noexcept = default;

DataPointIdentifier& operator=(const DataPointIdentifier& src) noexcept
{
if (&src != this) {
memcpy(this, &src, sizeof(DataPointIdentifier));
}
return *this;
}
DataPointIdentifier& operator=(const DataPointIdentifier& src) noexcept = default;

/**
* This stati procedure fills the given DataPointIdentifier object with
Expand Down
Loading