Skip to content

[23821] First align then save last_data_size_ #282

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

Merged
MiguelCompany merged 2 commits into from
Oct 15, 2025
Merged

[23821] First align then save last_data_size_ #282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694eadc
Refs #23821. First align then save `last_data_size_`.
MiguelCompany Oct 14, 2025
4fba644
Refs #23821. Uncrustify.
MiguelCompany Oct 14, 2025
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
180 changes: 48 additions & 132 deletions src/cpp/Cdr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,9 @@ Cdr& Cdr::serialize(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
last_data_size_ = sizeof(short_t);

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(short_t);

if (swap_bytes_)
{
Expand Down Expand Up @@ -584,11 +582,9 @@ Cdr& Cdr::serialize(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
last_data_size_ = sizeof(long_t);

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(long_t);

if (swap_bytes_)
{
Expand Down Expand Up @@ -631,11 +627,9 @@ Cdr& Cdr::serialize(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
last_data_size_ = align64_;

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

if (swap_bytes_)
{
Expand Down Expand Up @@ -670,11 +664,9 @@ Cdr& Cdr::serialize(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
last_data_size_ = sizeof(float_t);

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(float_t);

if (swap_bytes_)
{
Expand Down Expand Up @@ -705,11 +697,9 @@ Cdr& Cdr::serialize(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
last_data_size_ = align64_;

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

if (swap_bytes_)
{
Expand Down Expand Up @@ -744,11 +734,9 @@ Cdr& Cdr::serialize(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
last_data_size_ = align64_;

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

if (swap_bytes_)
{
Expand Down Expand Up @@ -990,15 +978,10 @@ Cdr& Cdr::serialize_array(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(*short_t);

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
const char* dst = reinterpret_cast<const char*>(short_t);
Expand Down Expand Up @@ -1037,15 +1020,10 @@ Cdr& Cdr::serialize_array(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(*long_t);

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
const char* dst = reinterpret_cast<const char*>(long_t);
Expand Down Expand Up @@ -1102,15 +1080,10 @@ Cdr& Cdr::serialize_array(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
const char* dst = reinterpret_cast<const char*>(longlong_t);
Expand Down Expand Up @@ -1155,15 +1128,10 @@ Cdr& Cdr::serialize_array(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(*float_t);

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
const char* dst = reinterpret_cast<const char*>(float_t);
Expand Down Expand Up @@ -1204,15 +1172,10 @@ Cdr& Cdr::serialize_array(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
const char* dst = reinterpret_cast<const char*>(double_t);
Expand Down Expand Up @@ -1258,15 +1221,10 @@ Cdr& Cdr::serialize_array(

if (((end_ - offset_) >= size_aligned) || resize(size_aligned))
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

#if FASTCDR_HAVE_FLOAT128 && FASTCDR_SIZEOF_LONG_DOUBLE < 16
if (swap_bytes_)
{
Expand Down Expand Up @@ -1388,11 +1346,9 @@ Cdr& Cdr::deserialize(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
last_data_size_ = sizeof(short_t);

// Align
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(short_t);

if (swap_bytes_)
{
Expand Down Expand Up @@ -1421,11 +1377,9 @@ Cdr& Cdr::deserialize(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
last_data_size_ = sizeof(long_t);

// Align
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(long_t);

if (swap_bytes_)
{
Expand Down Expand Up @@ -1456,11 +1410,9 @@ Cdr& Cdr::deserialize(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
last_data_size_ = align64_;

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

if (swap_bytes_)
{
Expand Down Expand Up @@ -1495,11 +1447,9 @@ Cdr& Cdr::deserialize(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
last_data_size_ = sizeof(float_t);

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(float_t);

if (swap_bytes_)
{
Expand Down Expand Up @@ -1530,11 +1480,9 @@ Cdr& Cdr::deserialize(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
last_data_size_ = align64_;

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

if (swap_bytes_)
{
Expand Down Expand Up @@ -1569,11 +1517,9 @@ Cdr& Cdr::deserialize(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
last_data_size_ = align64_;

// Align.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

if (swap_bytes_)
{
Expand Down Expand Up @@ -1862,15 +1808,10 @@ Cdr& Cdr::deserialize_array(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(*short_t);

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
char* dst = reinterpret_cast<char*>(short_t);
Expand Down Expand Up @@ -1909,15 +1850,10 @@ Cdr& Cdr::deserialize_array(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(*long_t);

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
char* dst = reinterpret_cast<char*>(long_t);
Expand Down Expand Up @@ -1976,15 +1912,10 @@ Cdr& Cdr::deserialize_array(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
char* dst = reinterpret_cast<char*>(longlong_t);
Expand Down Expand Up @@ -2029,15 +1960,10 @@ Cdr& Cdr::deserialize_array(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = sizeof(*float_t);

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
char* dst = reinterpret_cast<char*>(float_t);
Expand Down Expand Up @@ -2078,15 +2004,10 @@ Cdr& Cdr::deserialize_array(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

if (swap_bytes_)
{
char* dst = reinterpret_cast<char*>(double_t);
Expand Down Expand Up @@ -2132,15 +2053,10 @@ Cdr& Cdr::deserialize_array(

if ((end_ - offset_) >= size_aligned)
{
// Save last datasize.
// Align and save last datasize.
make_alignment(align);
last_data_size_ = align64_;

// Align if there are any elements
if (num_elements)
{
make_alignment(align);
}

#if FASTCDR_HAVE_FLOAT128 && FASTCDR_SIZEOF_LONG_DOUBLE < 16
if (swap_bytes_)
{
Expand Down