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

Fix the doc to avoid diffs between 1.8.4 and 1.8.13 outputs

This commit is contained in:
Maxime Gimeno 2017-01-24 09:39:23 +01:00
parent b8b5b64dc2
commit 82860688d1
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AABB_tree/include/CGAL/AABB_tree.h
View File

@ -1127,7 +1127,7 @@ public:
this->traversal(query, traversal_traits); this->traversal(query, traversal_traits);
return traversal_traits.is_intersection_found(); return traversal_traits.is_intersection_found();
} }
#ifndef DOXYGEN_RUNNING //To avoid doxygen to consider definition and declaration as 2 different functions (size_type causes problems)
template<typename Tr> template<typename Tr>
template<typename Query> template<typename Query>
typename AABB_tree<Tr>::size_type typename AABB_tree<Tr>::size_type
@ -1146,7 +1146,7 @@ public:
this->traversal(query, traversal_traits); this->traversal(query, traversal_traits);
return counter; return counter;
} }
#endif
template<typename Tr> template<typename Tr>
template<typename Query, typename OutputIterator> template<typename Query, typename OutputIterator>
OutputIterator OutputIterator

4
Documentation/doc/resources/1.8.13/BaseDoxyfile.in
View File

@ -931,7 +931,9 @@ EXCLUDE_SYMBOLS = Tr \
Cb \ Cb \
Fb \ Fb \
K \ K \
Traits Traits \
internal \
internal::* \
# The EXAMPLE_PATH tag can be used to specify one or more files or directories # The EXAMPLE_PATH tag can be used to specify one or more files or directories
# that contain example code fragments that are included (see the \include # that contain example code fragments that are included (see the \include

3
Documentation/doc/resources/1.8.4/BaseDoxyfile.in
View File

@ -816,7 +816,8 @@ EXCLUDE_SYMBOLS = Tr \
Cb \ Cb \
Fb \ Fb \
K \ K \
Traits Traits \
internal
# The EXAMPLE_PATH tag can be used to specify one or more files or # The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see # directories that contain example code fragments that are included (see

4
Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h
View File

@ -31,9 +31,9 @@
#include <CGAL/Polygon_2/polygon_assertions.h> #include <CGAL/Polygon_2/polygon_assertions.h>
namespace CGAL { namespace CGAL {
#ifndef DOXYGEN_RUNNING //to avoid conflicts
template <class _Traits, class _Container> class Polygon_2; template <class _Traits, class _Container> class Polygon_2;
#endif
template <class _Traits, class _Container> template <class _Traits, class _Container>
class Polygon_2_const_edge_circulator { class Polygon_2_const_edge_circulator {
public: public:

4
Polygon/include/CGAL/Polygon_2/Polygon_2_edge_iterator.h
View File

@ -29,9 +29,9 @@
#include <CGAL/circulator.h> #include <CGAL/circulator.h>
namespace CGAL { namespace CGAL {
#ifndef DOXYGEN_RUNNING //to avoid conflicts
template <class Traits_, class Container_> class Polygon_2; template <class Traits_, class Container_> class Polygon_2;
#ifndef
template <class Segment_> template <class Segment_>
class Polygon_2__Segment_ptr class Polygon_2__Segment_ptr
{ {

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
View File

@ -67,7 +67,7 @@ namespace internal {
based on solving a linear bi-Laplacian system with boundary constraints, based on solving a linear bi-Laplacian system with boundary constraints,
described in \cgalCite{Botsch2008OnLinearVariational}. described in \cgalCite{Botsch2008OnLinearVariational}.
The optional parameter `fairing_continuity` gives the ability to control the tangential The optional parameter `fairing_continuity` gives the ability to control the tangential
continuity C<sup>\a n</sup> of the output mesh. continuity C<sup>\a n </sup>of the output mesh.
The region described by `vertices` might contain multiple disconnected components. The region described by `vertices` might contain multiple disconnected components.
Note that the mesh connectivity is not altered in any way, Note that the mesh connectivity is not altered in any way,