Skip to content

Fix capnproto add_value_to_map overwriting all entries at index 0 #634

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
lixin-wei wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −3
Open

Fix capnproto add_value_to_map overwriting all entries at index 0 #634

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
7 changes: 4 additions & 3 deletions include/rfl/capnproto/Writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,11 @@ class RFL_API Writer {
template <class T>
OutputVarType add_value_to_map(const std::string_view& _name, const T& _var,
OutputMapType* _parent) const {
auto entries =
OutputArrayType{_parent->val_.get("entries").as<capnp::DynamicList>()};
auto entries = OutputArrayType{
.val_ = _parent->val_.get("entries").as<capnp::DynamicList>(),
.ix_ = _parent->ix_++};
auto new_entry = add_object_to_array(2, &entries);
add_value_to_object("key", _name, &new_entry);
add_value_to_object("key", std::string(_name), &new_entry);
return add_value_to_object("value", _var, &new_entry);
}

Expand Down
25 changes: 25 additions & 0 deletions tests/capnproto/test_map_value_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#include <map>
#include <rfl.hpp>
#include <string>

#include "write_and_read.hpp"

namespace test_map_value_types {

struct PersonWithStringMap {
rfl::Rename<"firstName", std::string> first_name;
std::map<std::string, std::string> nicknames;
};

TEST(capnproto, test_map_with_string_values) {
auto nicknames = std::map<std::string, std::string>();
nicknames["Bart"] = "El Barto";
nicknames["Lisa"] = "Lis";
nicknames["Maggie"] = "Mags";

const auto homer = PersonWithStringMap{.first_name = "Homer",
.nicknames = std::move(nicknames)};

write_and_read(homer);
}
} // namespace test_map_value_types
Loading