From 79123c8f53ce53516ea1414b8cd5d0287726dd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 12 Dec 2023 08:31:46 +0100 Subject: [PATCH 1/3] hide forward declaration to doxygen --- Point_set_3/include/CGAL/Point_set_3/IO.h | 2 ++ Point_set_3/include/CGAL/Point_set_3/IO/OFF.h | 2 ++ Point_set_3/include/CGAL/Point_set_3/IO/PLY.h | 2 ++ Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Point_set_3/include/CGAL/Point_set_3/IO.h b/Point_set_3/include/CGAL/Point_set_3/IO.h index 2e680a744f8..8630788e787 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO.h @@ -26,8 +26,10 @@ namespace CGAL { +#ifndef DOXYGEN_RUNNING template class Point_set_3; +#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h index 5bd35941615..cff22686ae7 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h @@ -24,8 +24,10 @@ namespace CGAL { +#ifndef DOXYGEN_RUNNING template class Point_set_3; +#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h index 76daf4494ab..b1f3e763b07 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h @@ -24,8 +24,10 @@ namespace CGAL { +#ifndef DOXYGEN_RUNNING template class Point_set_3; +#endif namespace IO { namespace internal { diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h index 72c00bd528e..ce968f49af6 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h @@ -23,8 +23,10 @@ namespace CGAL { +#ifndef DOXYGEN_RUNNING template class Point_set_3; +#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// From a701dbc21cbb76d46dfb4d0a03eb9cf842f5b86e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 13 Dec 2023 08:36:46 +0000 Subject: [PATCH 2/3] Deal with LAS.h --- Point_set_3/include/CGAL/Point_set_3/IO/LAS.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h b/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h index 7ecf30255ba..08afc1a220a 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h @@ -25,8 +25,10 @@ namespace CGAL { +#ifndef DOXYGEN_RUNNING template class Point_set_3; +#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// From 7935bcf42b4c8a9283d08d6637d6b75e5c999bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 14 Dec 2023 10:10:17 +0100 Subject: [PATCH 3/3] fix mismatching cond/endcode remove useless previous patches --- Point_set_3/include/CGAL/Point_set_3.h | 2 -- Point_set_3/include/CGAL/Point_set_3/IO.h | 4 ++-- Point_set_3/include/CGAL/Point_set_3/IO/LAS.h | 2 -- Point_set_3/include/CGAL/Point_set_3/IO/OFF.h | 2 -- Point_set_3/include/CGAL/Point_set_3/IO/PLY.h | 2 -- Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h | 2 -- 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Point_set_3/include/CGAL/Point_set_3.h b/Point_set_3/include/CGAL/Point_set_3.h index c9e6ba4f0ba..df85f0f3627 100644 --- a/Point_set_3/include/CGAL/Point_set_3.h +++ b/Point_set_3/include/CGAL/Point_set_3.h @@ -133,7 +133,6 @@ public: Index (const std::size_t& value) : value (static_cast(value)) { } Index () : value (static_cast(-1)) { } Index operator= (const Index& index) { value = index.value; return *this; } - /// \cond SKIP_IN_MANUAL operator std::size_t() const { return static_cast(value); } bool operator== (const Index& index) const { return value == index.value; } bool operator!= (const Index& index) const { return value != index.value; } @@ -694,7 +693,6 @@ public: \sa `number_of_removed_points()` */ std::size_t garbage_size () const { return number_of_removed_points(); } - /// \endcond /*! \brief returns `true` if there are elements marked as removed, `false` otherwise. diff --git a/Point_set_3/include/CGAL/Point_set_3/IO.h b/Point_set_3/include/CGAL/Point_set_3/IO.h index 8630788e787..789d44921d5 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO.h @@ -26,10 +26,8 @@ namespace CGAL { -#ifndef DOXYGEN_RUNNING template class Point_set_3; -#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -163,6 +161,8 @@ bool read_point_set(const std::string& fname, \param ps the point set \return `os` + + \relates Point_set_3 */ template std::ostream& operator<<(std::ostream& os, diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h b/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h index 08afc1a220a..7ecf30255ba 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/LAS.h @@ -25,10 +25,8 @@ namespace CGAL { -#ifndef DOXYGEN_RUNNING template class Point_set_3; -#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h index cff22686ae7..5bd35941615 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h @@ -24,10 +24,8 @@ namespace CGAL { -#ifndef DOXYGEN_RUNNING template class Point_set_3; -#endif //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h index b1f3e763b07..76daf4494ab 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h @@ -24,10 +24,8 @@ namespace CGAL { -#ifndef DOXYGEN_RUNNING template class Point_set_3; -#endif namespace IO { namespace internal { diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h index ce968f49af6..72c00bd528e 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h @@ -23,10 +23,8 @@ namespace CGAL { -#ifndef DOXYGEN_RUNNING template class Point_set_3; -#endif //////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////