From 89c4b509e1b43f194a1e6d509da839097f1d9908 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 9 Jun 2022 09:33:33 +0100 Subject: [PATCH 1/3] STL_extension: Fix URL to boost libs --- STL_Extension/doc/STL_Extension/Concepts/Hashable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/STL_Extension/doc/STL_Extension/Concepts/Hashable.h b/STL_Extension/doc/STL_Extension/Concepts/Hashable.h index d07c14cdf83..17fa2304230 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/Hashable.h +++ b/STL_Extension/doc/STL_Extension/Concepts/Hashable.h @@ -14,12 +14,11 @@ They can be disables by defining the macro `CGAL_DISABLE_HASH_OPENMESH`. \sa `CGAL::Unique_hash_map` \sa `std::unordered_set` \sa `std::unordered_map` -\sa `boost::unordered_set` -\sa `boost::unordered_map` +\sa `boost::unordered_set` +\sa `boost::unordered_map` */ class Hashable { }; - From 60df88453f2281835f8e4a5c93cb00344396c31d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 9 Jun 2022 12:44:10 +0100 Subject: [PATCH 2/3] No longer use the link to boost::result_of --- .../doc/Documentation/Developer_manual/Chapter_code_format.txt | 2 +- Documentation/doc/Documentation/Preliminaries.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt b/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt index 77e994d0270..fbc3a325b89 100644 --- a/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt +++ b/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt @@ -258,7 +258,7 @@ The first list of items are meant as rules, i.e., you should follow them. #endif // CGAL_THIS_IS_AN_EXAMPLE_H \endcode - Support the - result_of + result_of protocol whenever your functors have more than one return type otherwise provide a `result_type` member typedef. An example for this is a C++03 style `identity` functor: diff --git a/Documentation/doc/Documentation/Preliminaries.txt b/Documentation/doc/Documentation/Preliminaries.txt index e07d90e9e37..e194f3d46ec 100644 --- a/Documentation/doc/Documentation/Preliminaries.txt +++ b/Documentation/doc/Documentation/Preliminaries.txt @@ -47,7 +47,7 @@ After being based on the \CC standard released in 1998 (and later refined in 200 \section Preliminaries_functor Functor Return Types \cgal functors support the -result_of +result_of protocol. If a functor `F` has the same return type across all overloads of `operator()`, the nested type `F::result_type` is defined to be that type. Otherwise the From d9245b9cd63d024d401522fe32afd5d0126460b1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 10 Jun 2022 17:26:44 +0200 Subject: [PATCH 3/3] Remove any mention of result_of in the documentation --- .../Developer_manual/Chapter_code_format.txt | 23 ------------------- .../doc/Documentation/Preliminaries.txt | 10 -------- 2 files changed, 33 deletions(-) diff --git a/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt b/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt index fbc3a325b89..4d639ee7263 100644 --- a/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt +++ b/Documentation/doc/Documentation/Developer_manual/Chapter_code_format.txt @@ -257,29 +257,6 @@ The first list of items are meant as rules, i.e., you should follow them. ... #endif // CGAL_THIS_IS_AN_EXAMPLE_H \endcode -- Support the - result_of - protocol whenever your functors have more than one return type - otherwise provide a `result_type` member typedef. - An example for this is a C++03 style `identity` functor: - \code{.cpp} - struct Identity { - template - T& operator()(T& t) { return t; } - template - const T& operator()(const T& t) { return t; } - template - struct result; - template - struct result { - typedef T& type; - }; - template - struct result { - typedef const T& type; - }; - }; - \endcode The following items can be seen as recommendations in contrast to the rules of previous paragraph. diff --git a/Documentation/doc/Documentation/Preliminaries.txt b/Documentation/doc/Documentation/Preliminaries.txt index e194f3d46ec..a2ed83f6740 100644 --- a/Documentation/doc/Documentation/Preliminaries.txt +++ b/Documentation/doc/Documentation/Preliminaries.txt @@ -44,16 +44,6 @@ also avoid CMake to link with the native threads support library on your system. After being based on the \CC standard released in 1998 (and later refined in 2003) for a long time, \cgal is now based on a newer major version of the standard, C++14. -\section Preliminaries_functor Functor Return Types - -\cgal functors support the -result_of -protocol. If a functor `F` has the same return type across all -overloads of `operator()`, the nested type -`F::result_type` is defined to be that type. Otherwise the -return type of calling the functor with an argument of type -`Arg` can be accessed through \link CGAL::cpp11::result_of::type `CGAL::cpp11::result_of::type` \endlink. - \section preliminaries_secchecks Checks Much of the \cgal code contains assert statements for preconditions, and postconditions of functions