Skip to content
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

Jump to bottom

Clean up options warnings and fix redundant copies #1888

Merged
merged 1 commit into from
May 23, 2019
Merged

Clean up options warnings and fix redundant copies #1888

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
13 changes: 11 additions & 2 deletions test/unit_test/options_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,22 @@ BOOST_AUTO_TEST_CASE(create_argument_group) {
std::vector<std::string> loc2;
option_group_definition ag("g1");
ag(make_option("opt1", loc).keep());
ag.add(make_option("opt2", loc2));
ag(make_option("opt2", loc));
ag.add(make_option("opt3", loc2));
ag.add(make_option("opt4", loc2).keep());

BOOST_CHECK_EQUAL(ag.m_name, "g1");
BOOST_CHECK_EQUAL(ag.m_options[0]->m_name, "opt1");
BOOST_CHECK_EQUAL(ag.m_options[0]->m_keep, true);
BOOST_CHECK_EQUAL(ag.m_options[0]->m_type_hash, typeid(decltype(loc)).hash_code());

BOOST_CHECK_EQUAL(ag.m_options[1]->m_name, "opt2");
BOOST_CHECK_EQUAL(ag.m_options[1]->m_type_hash, typeid(decltype(loc2)).hash_code());
BOOST_CHECK_EQUAL(ag.m_options[1]->m_type_hash, typeid(decltype(loc)).hash_code());

BOOST_CHECK_EQUAL(ag.m_options[2]->m_name, "opt3");
BOOST_CHECK_EQUAL(ag.m_options[2]->m_type_hash, typeid(decltype(loc2)).hash_code());

BOOST_CHECK_EQUAL(ag.m_options[3]->m_name, "opt4");
BOOST_CHECK_EQUAL(ag.m_options[3]->m_keep, true);
BOOST_CHECK_EQUAL(ag.m_options[3]->m_type_hash, typeid(decltype(loc2)).hash_code());
}
8 changes: 4 additions & 4 deletions vowpalwabbit/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ struct option_group_definition
option_group_definition(std::string name) : m_name(name) {}

template <typename T>
option_group_definition& add(typed_option<T> op)
option_group_definition& add(T&& op)
{
m_options.push_back(std::make_shared<typed_option<T>>(op));
m_options.push_back(std::make_shared<typename std::decay<T>::type>(op));
return *this;
}

template <typename T>
option_group_definition& operator()(typed_option<T> op)
option_group_definition& operator()(T&& op)
{
add(op);
add(std::forward<T>(op));
return *this;
}

Expand Down
2 changes: 1 addition & 1 deletion vowpalwabbit/options_boost_po.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void options_boost_po::check_unregistered()

template <>
void options_boost_po::add_to_description_impl<typelist<>>(
std::shared_ptr<base_option> opt, po::options_description& options_description)
std::shared_ptr<base_option>, po::options_description&)
{
THROW("That is an unsupported option type.");
}
6 changes: 3 additions & 3 deletions vowpalwabbit/options_boost_po.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct options_boost_po : public options_i
.run();

auto it = std::find_if(pos.options.begin(), pos.options.end(),
[&key](boost::program_options::option option) { return option.string_key == key; });
[&key](boost::program_options::option& option) { return option.string_key == key; });

if (it != pos.options.end() && (*it).value.size() > 0)
{
Expand Down Expand Up @@ -214,7 +214,7 @@ template <typename T>
po::typed_value<std::vector<T>>* options_boost_po::add_notifier(
std::shared_ptr<typed_option<T>>& opt, po::typed_value<std::vector<T>>* po_value)
{
return po_value->notifier([this, opt](std::vector<T> final_arguments) {
return po_value->notifier([opt](std::vector<T> final_arguments) {
T first = final_arguments[0];
for (auto const& item : final_arguments)
{
Expand All @@ -236,7 +236,7 @@ template <typename T>
po::typed_value<std::vector<T>>* options_boost_po::add_notifier(
std::shared_ptr<typed_option<std::vector<T>>>& opt, po::typed_value<std::vector<T>>* po_value)
{
return po_value->notifier([this, opt](std::vector<T> final_arguments) {
return po_value->notifier([opt](std::vector<T> final_arguments) {
// Set the value for the listening location.
opt->m_location = final_arguments;
opt->value(final_arguments);
Expand Down
4 changes: 2 additions & 2 deletions vowpalwabbit/options_serializer_boost_po.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ size_t options_serializer_boost_po::size() { return m_output_stream.str().size()
void options_serializer_boost_po::add(base_option& option) { add_impl<supported_options_types>(option); }

template <>
void options_serializer_boost_po::serialize<bool>(typed_option<bool> typed_option)
void options_serializer_boost_po::serialize<bool>(typed_option<bool>& typed_option)
{
if (typed_option.value())
{
Expand All @@ -20,7 +20,7 @@ void options_serializer_boost_po::serialize<bool>(typed_option<bool> typed_optio
}

template <>
void options_serializer_boost_po::add_impl<typelist<>>(base_option& options)
void options_serializer_boost_po::add_impl<typelist<>>(base_option&)
{
THROW("That is an unsupported option type.");
}
6 changes: 3 additions & 3 deletions vowpalwabbit/options_serializer_boost_po.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ struct options_serializer_boost_po : options_serializer_i
}

template <typename T>
void serialize(typed_option<T> typed_option)
void serialize(typed_option<T>& typed_option)
{
m_output_stream << " --" << typed_option.m_name << " " << typed_option.value();
}

template <typename T>
void serialize(typed_option<std::vector<T>> typed_option)
void serialize(typed_option<std::vector<T>>& typed_option)
{
auto vec = typed_option.value();
if (vec.size() > 0)
Expand All @@ -69,7 +69,7 @@ struct options_serializer_boost_po : options_serializer_i
};

template <>
void options_serializer_boost_po::serialize<bool>(typed_option<bool> typed_argument);
void options_serializer_boost_po::serialize<bool>(typed_option<bool>& typed_argument);

template <>
void options_serializer_boost_po::add_impl<typelist<>>(base_option& options);
Expand Down