BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C++: Update InputFormat::get_options for latest version of input API.

This commit is contained in:
Martin Ling 2014-08-24 20:11:35 +01:00 committed by Bert Vermeulen
parent 43942280bb
commit 7f5a036750
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bindings/cxx/classes.cpp
View File

@ -1130,14 +1130,13 @@ string InputFormat::get_description()
map<string, shared_ptr<Option>> InputFormat::get_options()
{
const struct sr_option *option = sr_input_options_get(structure);
auto option_array = shared_ptr<const struct sr_option>(
option, [=](const struct sr_option *) {
sr_input_options_free(structure); });
const struct sr_option **options = sr_input_options_get(structure);
auto option_array = shared_ptr<const struct sr_option *>(
options, sr_input_options_free);
map<string, shared_ptr<Option>> result;
for (; option->id; option++)
result[option->id] = shared_ptr<Option>(
new Option(option, option_array), Option::Deleter());
for (int i = 0; options[i]; i++)
result[options[i]->id] = shared_ptr<Option>(
new Option(options[i], option_array), Option::Deleter());
return result;
}