Skip to content

Commit cdf3dc9

Browse files
authored
Merge pull request #259 from beku-epitome/bugfix/clang-compile
Clang fails due to `cbegin()` returning an iterator, not a pointer, when casting to `std::string_view`
2 parents 1940b35 + 580649b commit cdf3dc9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/util/registry/Registry.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Registry final : public cyphal::registry::Registry
8383

8484
TAccessResponse onAccess_1_0_Request_Received(TAccessRequest const &req)
8585
{
86-
auto const req_name = std::string_view(reinterpret_cast<const char *>(req.name.name.cbegin()),
86+
auto const req_name = std::string_view(reinterpret_cast<const char *>(req.name.name.data()),
8787
req.name.name.size());
8888

8989
/* Try to set the registers value. Note, if this is a RO register

src/util/storage/register_storage.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ template <typename FeedWatchdogFunc>
3636

3737
// Find the next register in the registry.
3838
const auto reg_name_storage = rgy.index(index); // This is a little suboptimal but we don't care.
39-
const auto reg_name = std::string_view(reinterpret_cast<const char *>(reg_name_storage.name.cbegin()), reg_name_storage.name.size());
39+
const auto reg_name = std::string_view(reinterpret_cast<const char *>(reg_name_storage.name.data()), reg_name_storage.name.size());
4040
if (reg_name.empty())
4141
{
4242
break; // No more registers to load.
@@ -107,7 +107,7 @@ template <typename ResetPredicate, typename FeedWatchdogFunc>
107107
feed_watchdog_func();
108108

109109
const auto reg_name_storage = rgy.index(index); // This is a little suboptimal but we don't care.
110-
const auto reg_name = std::string_view(reinterpret_cast<const char *>(reg_name_storage.name.cbegin()), reg_name_storage.name.size());
110+
const auto reg_name = std::string_view(reinterpret_cast<const char *>(reg_name_storage.name.data()), reg_name_storage.name.size());
111111
if (reg_name.empty())
112112
{
113113
break; // No more registers to load.

0 commit comments

Comments
 (0)