"notebooks/git@developer.sourcefind.cn:OpenDAS/dgl.git" did not exist on "f090e397df7527415d1c1ea2cb7aa665ba8fc945"
Commit 75fbc56c authored by Davis King's avatar Davis King
Browse files

Fixed name conflicts that prevented the python bindings from compiling in visual sudio 2013.

parent badd34ef
...@@ -31,14 +31,14 @@ void _make_sparse_vector2 ( ...@@ -31,14 +31,14 @@ void _make_sparse_vector2 (
make_sparse_vector_inplace(v[i]); make_sparse_vector_inplace(v[i]);
} }
tuple _load_libsvm_formatted_data ( boost::python::tuple _load_libsvm_formatted_data(
const std::string& file_name const std::string& file_name
) )
{ {
std::vector<sparse_vect> samples; std::vector<sparse_vect> samples;
std::vector<double> labels; std::vector<double> labels;
load_libsvm_formatted_data(file_name, samples, labels); load_libsvm_formatted_data(file_name, samples, labels);
return make_tuple(samples, labels); return boost::python::make_tuple(samples, labels);
} }
void _save_libsvm_formatted_data ( void _save_libsvm_formatted_data (
......
...@@ -128,9 +128,9 @@ cv cv__getitem2__(cv& m, slice r) ...@@ -128,9 +128,9 @@ cv cv__getitem2__(cv& m, slice r)
return temp; return temp;
} }
tuple cv_get_matrix_size(cv& m) boost::python::tuple cv_get_matrix_size(cv& m)
{ {
return make_tuple(m.nr(), m.nc()); return boost::python::make_tuple(m.nr(), m.nc());
} }
void bind_vector() void bind_vector()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment