Fix broken overload calls

This commit is contained in:
Mael Rouxel-Labbé 2020-05-26 19:35:03 +02:00
parent 3ea5fc5a10
commit 195f7a928d
3 changed files with 8 additions and 14 deletions

View File

@ -133,7 +133,7 @@ bool read_GOCAD(std::istream& in,
bool verbose = true)
{
std::pair<std::string, std::string> dummy;
return internal::read_GOCAD(in, dummy, g, np, verbose);
return IO::internal::read_GOCAD(in, dummy, g, np, verbose);
}
template <typename FaceGraph>
@ -141,8 +141,7 @@ bool read_GOCAD(std::istream& in,
std::pair<std::string, std::string>& name_and_color,
FaceGraph& g)
{
return internal::read_GOCAD(in, name_and_color, g, parameters::all_default());
return IO::internal::read_GOCAD(in, name_and_color, g, parameters::all_default());
}
/// \ingroup PkgBGLIOFct
@ -175,7 +174,7 @@ bool read_GOCAD(const char* fname, FaceGraph& g, const CGAL_BGL_NP_CLASS& np, bo
std::ifstream in(fname);
std::pair<std::string, std::string> dummy;
return read_GOCAD(in, dummy, g, np, verbose);
return IO::internal::read_GOCAD(in, dummy, g, np, verbose);
}
template <typename FaceGraph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>

View File

@ -154,12 +154,12 @@ template <typename FaceGraph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_PLY(const std::string& fname, FaceGraph& g, const CGAL_BGL_NP_CLASS& np,
bool verbose = true)
{
return IO::internal::read_PLY(fname.c_str(), g, np, verbose);
std::ifstream is(fname.c_str());
return IO::internal::read_PLY_BGL(is, g, np, verbose);
}
template <typename FaceGraph>
bool read_PLY(std::istream& in, FaceGraph& g)
bool read_PLY(std::istream& in, FaceGraph& g) // @todo uniformize is/in os/out
{
return IO::internal::read_PLY_BGL(in, g, parameters::all_default());
}

View File

@ -475,17 +475,12 @@ bool write_VTP(std::ostream& os, const FaceGraph& g) { return write_VTP(os, g, C
template<typename FaceGraph>
bool write_VTP(const char* fname, const FaceGraph& g) { return write_VTP(fname, g, parameters::all_default()); }
template<typename FaceGraph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool write_VTP(const std::string& fname, const FaceGraph& g, const CGAL_BGL_NP_CLASS& np) {
return write_VTP(fname.c_str(), g, np);
}
bool write_VTP(const std::string& fname, const FaceGraph& g, const CGAL_BGL_NP_CLASS& np) { return write_VTP(fname.c_str(), g, np); }
template<typename FaceGraph>
bool write_VTP(const std::string& fname, const FaceGraph& g) {
return write_VTP(fname, g, parameters::all_default());
}
bool write_VTP(const std::string& fname, const FaceGraph& g) { return write_VTP(fname, g, parameters::all_default()); }
} // namespace CGAL
#endif // defined(CGAL_USE_VTK) || defined(DOXYGEN_RUNNING)
#endif // CGAL_BGL_IO_VTK_H