Commit 65f21491 authored by Dominik Charousset's avatar Dominik Charousset

Announce vector<string> per default

parent 0d28685e
...@@ -86,7 +86,9 @@ const char* mapped_type_names[][2] = { ...@@ -86,7 +86,9 @@ const char* mapped_type_names[][2] = {
"std::allocator<std::pair<const @str,@str>>>", "std::allocator<std::pair<const @str,@str>>>",
"@strmap"}, "@strmap"},
// std::vector<char> // std::vector<char>
{"std::vector<@i8,std::allocator<@i8>>", "@charbuf"} {"std::vector<@i8,std::allocator<@i8>>", "@charbuf"},
// std::vector<std::string>
{"std::vector<@str,std::allocator<@str>>", "@strvec"}
}; };
// the order of this table must be *identical* to mapped_type_names // the order of this table must be *identical* to mapped_type_names
using static_type_table = type_list<bool, using static_type_table = type_list<bool,
...@@ -797,6 +799,8 @@ class utim_impl : public uniform_type_info_map { ...@@ -797,6 +799,8 @@ class utim_impl : public uniform_type_info_map {
using charbuf = std::vector<char>; using charbuf = std::vector<char>;
using strvec = std::vector<std::string>;
using builtin_types = std::tuple<uti_impl<node_id>, using builtin_types = std::tuple<uti_impl<node_id>,
uti_impl<channel>, uti_impl<channel>,
uti_impl<down_msg>, uti_impl<down_msg>,
...@@ -829,7 +833,8 @@ class utim_impl : public uniform_type_info_map { ...@@ -829,7 +833,8 @@ class utim_impl : public uniform_type_info_map {
int_tinfo<uint32_t>, int_tinfo<uint32_t>,
int_tinfo<int64_t>, int_tinfo<int64_t>,
int_tinfo<uint64_t>, int_tinfo<uint64_t>,
default_uniform_type_info<charbuf>>; default_uniform_type_info<charbuf>,
default_uniform_type_info<strvec>>;
builtin_types m_storage; builtin_types m_storage;
......
...@@ -159,7 +159,8 @@ int main() { ...@@ -159,7 +159,8 @@ int main() {
"@strmap", // map<string,string> "@strmap", // map<string,string>
"@timeout", // timeout_msg "@timeout", // timeout_msg
"@sync_exited", // sync_exited_msg "@sync_exited", // sync_exited_msg
"@sync_timeout" // sync_timeout_msg "@sync_timeout", // sync_timeout_msg
"@strvec" // vector<string>
}; };
if (check_types(expected)) { if (check_types(expected)) {
// causes the middleman to create its singleton // causes the middleman to create its singleton
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment