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

WIP

This commit is contained in:
Sébastien Loriot 2022-01-04 17:50:56 +01:00
parent e98fc29dda
commit 0ce2e8b535
2 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
BGL/include/CGAL/boost/graph/IO/GOCAD.h
View File

@ -112,7 +112,7 @@ template <typename Graph,
bool read_GOCAD(std::istream& is, bool read_GOCAD(std::istream& is,
std::pair<std::string, std::string>& name_and_color, std::pair<std::string, std::string>& name_and_color,
Graph& g, Graph& g,
const CGAL_BGL_NP_CLASS& np const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr , typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr
#endif #endif
@ -133,27 +133,14 @@ bool read_GOCAD(std::istream& is,
/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL
template <typename Graph>
bool read_GOCAD(std::istream& is, std::pair<std::string, std::string>& name_and_color, Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return read_GOCAD(is, name_and_color, g, parameters::all_default());
}
template <typename Graph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> template <typename Graph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_GOCAD(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np, bool read_GOCAD(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values(),
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr) typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{ {
std::pair<std::string, std::string> dummy; std::pair<std::string, std::string> dummy;
return read_GOCAD(is, dummy, g, np); return read_GOCAD(is, dummy, g, np);
} }
template <typename Graph>
bool read_GOCAD(std::istream& is, Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return read_GOCAD(is, g, parameters::all_default());
}
/// \endcond /// \endcond
@ -199,7 +186,7 @@ template <typename Graph,
bool read_GOCAD(const std::string& fname, bool read_GOCAD(const std::string& fname,
std::pair<std::string, std::string>& name_and_color, std::pair<std::string, std::string>& name_and_color,
Graph& g, Graph& g,
const CGAL_BGL_NP_CLASS& np const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr , typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr
#endif #endif
@ -212,28 +199,14 @@ bool read_GOCAD(const std::string& fname,
/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL
template <typename Graph>
bool read_GOCAD(const std::string& fname, std::pair<std::string, std::string>& name_and_color, Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return read_GOCAD(fname, name_and_color, g, parameters::all_default());
}
template <typename Graph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> template <typename Graph, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool read_GOCAD(const std::string& fname, Graph& g, const CGAL_BGL_NP_CLASS& np, bool read_GOCAD(const std::string& fname, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values(),
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr) typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{ {
std::pair<std::string, std::string> dummy; std::pair<std::string, std::string> dummy;
return read_GOCAD(fname, dummy, g, np); return read_GOCAD(fname, dummy, g, np);
} }
template <typename Graph>
bool read_GOCAD(const std::string& fname, Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return read_GOCAD(fname, g, parameters::all_default());
}
/// \endcond /// \endcond
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -276,7 +249,7 @@ template <typename Graph,
bool write_GOCAD(std::ostream& os, bool write_GOCAD(std::ostream& os,
const char* name, const char* name,
const Graph& g, const Graph& g,
const CGAL_BGL_NP_CLASS& np const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr , typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr
#endif #endif
@ -336,17 +309,6 @@ bool write_GOCAD(std::ostream& os,
return os.good(); return os.good();
} }
/// \cond SKIP_IN_MANUAL
template <typename Graph>
bool write_GOCAD(std::ostream& os, const char* name, const Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return write_GOCAD(os, name, g, parameters::all_default());
}
/// \endcond
/// \ingroup PkgBGLIoFuncsGOCAD /// \ingroup PkgBGLIoFuncsGOCAD
/// ///
/// \brief writes the graph `g` in the \ref IOStreamGocad into `os`. /// \brief writes the graph `g` in the \ref IOStreamGocad into `os`.
@ -383,7 +345,7 @@ template <typename Graph,
typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool write_GOCAD(std::ostream& os, bool write_GOCAD(std::ostream& os,
const Graph& g, const Graph& g,
const CGAL_BGL_NP_CLASS& np const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr , typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr
#endif #endif
@ -392,17 +354,6 @@ bool write_GOCAD(std::ostream& os,
return write_GOCAD(os, "anonymous", g, np); return write_GOCAD(os, "anonymous", g, np);
} }
/// \cond SKIP_IN_MANUAL
template <typename Graph>
bool write_GOCAD(std::ostream& os, const Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return write_GOCAD(os, g, parameters::all_default());
}
/// \endcond
/// \ingroup PkgBGLIoFuncsGOCAD /// \ingroup PkgBGLIoFuncsGOCAD
/// ///
/// \brief writes the graph `g` into a file named `fname`, using the \ref IOStreamGocad. /// \brief writes the graph `g` into a file named `fname`, using the \ref IOStreamGocad.
@ -439,7 +390,7 @@ template <typename Graph,
typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> typename CGAL_BGL_NP_TEMPLATE_PARAMETERS>
bool write_GOCAD(const std::string& fname, bool write_GOCAD(const std::string& fname,
const Graph& g, const Graph& g,
const CGAL_BGL_NP_CLASS& np const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr , typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr
#endif #endif
@ -451,17 +402,6 @@ bool write_GOCAD(const std::string& fname,
return write_GOCAD(os, fname.c_str(), g, np); return write_GOCAD(os, fname.c_str(), g, np);
} }
/// \cond SKIP_IN_MANUAL
template <typename Graph>
bool write_GOCAD(const std::string& fname, const Graph& g,
typename boost::disable_if<internal::is_Point_set_or_Range_or_Iterator<Graph> >::type* = nullptr)
{
return write_GOCAD(fname, g, parameters::all_default());
}
/// \endcond
}} // namespace CGAL::IO }} // namespace CGAL::IO
#endif // CGAL_BGL_IO_GOCAD_H #endif // CGAL_BGL_IO_GOCAD_H

2
BGL/include/CGAL/boost/graph/Named_function_parameters.h
View File

@ -21,7 +21,7 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#define CGAL_BGL_NP_TEMPLATE_PARAMETERS T, typename Tag, typename Base #define CGAL_BGL_NP_TEMPLATE_PARAMETERS T=bool, typename Tag=CGAL::internal_np::all_default_t, typename Base=CGAL::internal_np::No_property
#define CGAL_BGL_NP_CLASS CGAL::Named_function_parameters<T,Tag,Base> #define CGAL_BGL_NP_CLASS CGAL::Named_function_parameters<T,Tag,Base>