Skip to content

[MED] OCTET_STRING improvements #40

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
cppden merged 1 commit into from
Mar 2, 2026
Merged

[MED] OCTET_STRING improvements #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions med/container.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ struct cont_is
//optional or mandatory field w/ setter => can be set implicitly
if constexpr (AOptional<IE> || AHasSetterType<IE>)
{
CODEC_TRACE("O/S[%s] is_set=%d", name<IE>(), static_cast<IE const&>(seq).is_set());
// CODEC_TRACE("O/S[%s] is_set=%d", name<IE>(), static_cast<IE const&>(seq).is_set());
return static_cast<IE const&>(seq).is_set();
}
else //mandatory field w/o setter => s.b. set explicitly
{
CODEC_TRACE("M[%s]%s is_set=%d", name<IE>(), (APredefinedValue<IE> ? "[init/const]":""), static_cast<IE const&>(seq).is_set());
// CODEC_TRACE("M[%s]%s is_set=%d", name<IE>(), (APredefinedValue<IE> ? "[init/const]":""), static_cast<IE const&>(seq).is_set());
if constexpr (APredefinedValue<IE>) //don't account predefined IEs like init/const
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion med/field.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class multi_field : public detail::define_meta_info<META_INFO>
{
for (auto& f : m_fields)
{
CODEC_TRACE("%s: %s=%p[%c][%zu]", __FUNCTION__, name<field_type>(), (void*)&f, f.value.is_set()?'+':'-', inplace);
// CODEC_TRACE("%s: %s=%p[%c][%zu]", __FUNCTION__, name<field_type>(), (void*)&f, f.value.is_set()?'+':'-', inplace);
if (!f.value.is_set()) return &f;
}
}
Expand Down
13 changes: 9 additions & 4 deletions med/octet_string.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Distributed under the MIT License

namespace med {

constexpr std::size_t MAX_OCTS = std::numeric_limits<num_octs_t>::max();

template <std::size_t MIN, std::size_t MAX>
struct octets
{
Expand Down Expand Up @@ -202,7 +204,7 @@ struct octet_string_impl : IE<IE_OCTET_STRING>
return false;
}
}
if constexpr (traits::max_octets != inf())
if constexpr (traits::max_octets != MAX_OCTS)
{
if (len > traits::max_octets)
{
Expand Down Expand Up @@ -253,8 +255,6 @@ struct ascii_string : octet_string<T...>
}
};

constexpr std::size_t MAX_OCTS = std::numeric_limits<num_octs_t>::max();

template <class VALUE>
struct octet_string<VALUE, void, void>
: octet_string_impl<detail::octet_traits<uint8_t, 0, MAX_OCTS>, VALUE> {};
Expand Down Expand Up @@ -311,8 +311,13 @@ struct octet_string<octets_fix_intern<FIXED>, void, void>

void set(uint8_t const(&data)[FIXED]) { this->set_encoded(FIXED, &data[0]); }
};

template <std::size_t MAX, std::size_t MIN>
struct octet_string<octets_var_intern<MAX>, min<MIN>, void>
: octet_string_impl<detail::octet_traits<uint8_t, MIN, MAX>, octets_var_intern<MAX>> {};

template <std::size_t MAX>
struct octet_string<octets_var_intern<MAX>, void, void>
: octet_string_impl<detail::octet_traits<uint8_t, 0, MAX>, octets_var_intern<MAX>>
{
};
} //end: namespace med