Code review.

diff --git a/cmake/configure/configure_cgal.cmake b/cmake/configure/configure_cgal.cmake
index d13ac066bae357e00718333e7f4a457a1c57efe8..bd7d53d71d2db29182c7c266886ee7898f7a4ce1 100644 (file)
--- a/cmake/configure/configure_cgal.cmake
+++ b/cmake/configure/configure_cgal.cmake
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2017 by the deal.II authors
+## Copyright (C) 2022 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##

diff --git a/cmake/modules/FindCGAL.cmake b/cmake/modules/FindCGAL.cmake
index 6fe00d2b21424983dd05c855c6a9e96b4b4ff4ec..06c380d74ffac4911ea23469a198da6661184167 100644 (file)
--- a/cmake/modules/FindCGAL.cmake
+++ b/cmake/modules/FindCGAL.cmake
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2017 by the deal.II authors
+## Copyright (C) 2022 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##

diff --git a/include/deal.II/cgal/utilities.h b/include/deal.II/cgal/utilities.h
index deba433c95bf3a7513fe97721aad8fd9fb8e3685..b0c3020938c2b45adc26fd284e0650b146ef1c2b 100644 (file)
--- a/include/deal.II/cgal/utilities.h
+++ b/include/deal.II/cgal/utilities.h
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2020 by the deal.II authors
+// Copyright (C) 2022 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -47,18 +47,19 @@ namespace CGALWrappers
    */
   template <typename CGALPointType, int dim>
   inline CGALPointType
-  to_cgal(const dealii::Point<dim> &p);
+  dealii_point_to_cgal_point(const dealii::Point<dim> &p);
 
   /**
    * Convert from various CGAL point types to deal.II Point.
+   *
    * @tparam dim Dimension of the point
    * @tparam CGALPointType Any of the CGAL point types
-   * @param p
-   * @return dealii::Point<dim>
+   * @param p An input CGAL point type
+   * @return dealii::Point<dim> The corresponding deal.II point.
    */
   template <int dim, typename CGALPointType>
   inline dealii::Point<dim>
-  to_dealii(const CGALPointType &p);
+  cgal_point_to_dealii_point(const CGALPointType &p);
 } // namespace CGALWrappers
 
 #  ifndef DOXYGEN
@@ -67,7 +68,7 @@ namespace CGALWrappers
 {
   template <typename CGALPointType, int dim>
   inline CGALPointType
-  to_cgal(const dealii::Point<dim> &p)
+  dealii_point_to_cgal_point(const dealii::Point<dim> &p)
   {
     constexpr int cdim = CGALPointType::Ambient_dimension::value;
     static_assert(dim <= cdim, "Only dim <= cdim supported");
@@ -86,7 +87,7 @@ namespace CGALWrappers
 
   template <int dim, typename CGALPointType>
   inline dealii::Point<dim>
-  to_dealii(const CGALPointType &p)
+  cgal_point_to_dealii_point(const CGALPointType &p)
   {
     constexpr int cdim = CGALPointType::Ambient_dimension::value;
     if constexpr (dim == 1)

diff --git a/tests/cgal/cgal_point_01.cc b/tests/cgal/cgal_point_01.cc
index 26ca14cb2b865aefc45c4cb55614dbde80682e47..81e2ac516c0b5a5951b401de4cb3415736963072 100644 (file)
--- a/tests/cgal/cgal_point_01.cc
+++ b/tests/cgal/cgal_point_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2020 by the deal.II authors
+// Copyright (C) 2022 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -32,15 +32,15 @@ main()
   using CGALPoint = CGAL::Point_3<CGAL::Simple_cartesian<double>>;
   // Test conversion from deal.II Point to CGAL Point
   {
-    const Point<3> p(1.0, 2.0, 3.0);
-    const auto     cgal_point = to_cgal<CGALPoint>(p);
+    const Point<3> dealii_point(1.0, 2.0, 3.0);
+    const auto cgal_point = dealii_point_to_cgal_point<CGALPoint>(dealii_point);
     deallog << "CGAL Point: " << cgal_point << std::endl;
   }
 
   // Test conversion from CGAL Point to deal.II Point
   {
     const CGALPoint cgal_point(1.0, 2.0, 3.0);
-    const auto      deal_ii_point = to_dealii<3>(cgal_point);
-    deallog << "deal.II Point: " << deal_ii_point << std::endl;
+    const auto      dealii_point = cgal_point_to_dealii_point<3>(cgal_point);
+    deallog << "deal.II Point: " << dealii_point << std::endl;
   }
 }