songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qualify make_tuple with boost::, otherwise the one in namespace std is picked, 

and std::tuple is not compatible with zip_iterator.
This commit is contained in:
Sylvain Pion 2009-05-07 20:07:59 +00:00
parent c9fc90bab4
commit 7eb6265e30
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
View File

@ -191,7 +191,6 @@ void create_shifted_instance(const CGAL::Quadratic_program_from_mps <IT>& qp,
// output:
using boost::make_transform_iterator;
using boost::make_zip_iterator;
using boost::make_tuple;
std::auto_ptr<std::ofstream> out = create_output_file(file, dir, "shifted");
write_MPS(*out,
@ -204,20 +203,20 @@ void create_shifted_instance(const CGAL::Quadratic_program_from_mps <IT>& qp,
m,
qp.get_a(),
make_transform_iterator(
make_zip_iterator(make_tuple(qp.get_b(),Av.begin())),
make_zip_iterator(boost::make_tuple(qp.get_b(),Av.begin())),
tuple_add<IT>()),
qp.get_r(),
qp.get_fl(),
make_transform_iterator(
make_zip_iterator(make_tuple(qp.get_l(),v.begin())),
make_zip_iterator(boost::make_tuple(qp.get_l(),v.begin())),
tuple_add<IT>()),
qp.get_fu(),
make_transform_iterator(
make_zip_iterator(make_tuple(qp.get_u(),v.begin())),
make_zip_iterator(boost::make_tuple(qp.get_u(),v.begin())),
tuple_add<IT>()),
qp.get_d(),
make_transform_iterator(
make_zip_iterator(make_tuple(qp.get_c(),mvTD.begin())),
make_zip_iterator(boost::make_tuple(qp.get_c(),mvTD.begin())),
tuple_add<IT>()),
qp.get_c0()
)