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