fix travis build

This commit is contained in:
Thomas Fussell 2015-10-26 17:27:26 -04:00
parent ae0d572776
commit e9ebade1af
2 changed files with 18 additions and 18 deletions

View File

@ -397,15 +397,15 @@ void style_reader::read_borders(pugi::xml_node borders_node)
border new_border;
std::vector<std::tuple<std::string, side *, bool *>> sides;
sides.push_back({"start", &new_border.start, &new_border.start_assigned});
sides.push_back({"end", &new_border.end, &new_border.end_assigned});
sides.push_back({"left", &new_border.left, &new_border.left_assigned});
sides.push_back({"right", &new_border.right, &new_border.right_assigned});
sides.push_back({"top", &new_border.top, &new_border.top_assigned});
sides.push_back({"bottom", &new_border.bottom, &new_border.bottom_assigned});
sides.push_back({"diagonal", &new_border.diagonal, &new_border.diagonal_assigned});
sides.push_back({"vertical", &new_border.vertical, &new_border.vertical_assigned});
sides.push_back({"horizontal", &new_border.horizontal, &new_border.horizontal_assigned});
sides.push_back(std::make_tuple("start", &new_border.start, &new_border.start_assigned));
sides.push_back(std::make_tuple("end", &new_border.end, &new_border.end_assigned));
sides.push_back(std::make_tuple("left", &new_border.left, &new_border.left_assigned));
sides.push_back(std::make_tuple("right", &new_border.right, &new_border.right_assigned));
sides.push_back(std::make_tuple("top", &new_border.top, &new_border.top_assigned));
sides.push_back(std::make_tuple("bottom", &new_border.bottom, &new_border.bottom_assigned));
sides.push_back(std::make_tuple("diagonal", &new_border.diagonal, &new_border.diagonal_assigned));
sides.push_back(std::make_tuple("vertical", &new_border.vertical, &new_border.vertical_assigned));
sides.push_back(std::make_tuple("horizontal", &new_border.horizontal, &new_border.horizontal_assigned));
for(const auto &side : sides)
{

View File

@ -167,15 +167,15 @@ std::string style_writer::write_table() const
auto border_node = borders_node.append_child("border");
std::vector<std::tuple<std::string, const side, bool>> sides;
sides.push_back({"start", border_.start, border_.start_assigned});
sides.push_back({"end", border_.end, border_.end_assigned});
sides.push_back({"left", border_.left, border_.left_assigned});
sides.push_back({"right", border_.right, border_.right_assigned});
sides.push_back({"top", border_.top, border_.top_assigned});
sides.push_back({"bottom", border_.bottom, border_.bottom_assigned});
sides.push_back({"diagonal", border_.diagonal, border_.diagonal_assigned});
sides.push_back({"vertical", border_.vertical, border_.vertical_assigned});
sides.push_back({"horizontal", border_.horizontal, border_.horizontal_assigned});
sides.push_back(std::make_tuple("start", border_.start, border_.start_assigned));
sides.push_back(std::make_tuple("end", border_.end, border_.end_assigned));
sides.push_back(std::make_tuple("left", border_.left, border_.left_assigned));
sides.push_back(std::make_tuple("right", border_.right, border_.right_assigned));
sides.push_back(std::make_tuple("top", border_.top, border_.top_assigned));
sides.push_back(std::make_tuple("bottom", border_.bottom, border_.bottom_assigned));
sides.push_back(std::make_tuple("diagonal", border_.diagonal, border_.diagonal_assigned));
sides.push_back(std::make_tuple("vertical", border_.vertical, border_.vertical_assigned));
sides.push_back(std::make_tuple("horizontal", border_.horizontal, border_.horizontal_assigned));
for(const auto &side_tuple : sides)
{