From 7eb6265e3065d54ea102ab02a25d16575569e5a5 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Thu, 7 May 2009 20:07:59 +0000 Subject: [PATCH] Qualify make_tuple with boost::, otherwise the one in namespace std is picked, and std::tuple is not compatible with zip_iterator. --- QP_solver/test/QP_solver/master_mps_to_derivatives.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp b/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp index 052bc688ec4..4d163c3ac9a 100644 --- a/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp +++ b/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp @@ -191,7 +191,6 @@ void create_shifted_instance(const CGAL::Quadratic_program_from_mps & qp, // output: using boost::make_transform_iterator; using boost::make_zip_iterator; - using boost::make_tuple; std::auto_ptr out = create_output_file(file, dir, "shifted"); write_MPS(*out, @@ -204,20 +203,20 @@ void create_shifted_instance(const CGAL::Quadratic_program_from_mps & 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()), 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()), 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()), 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()), qp.get_c0() )