From 9948eb84d9548960d44848978580d486a7dd1eef Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 24 Apr 2025 18:51:48 -0600 Subject: [PATCH] Un-guard two p4est declarations. --- include/deal.II/distributed/p4est_wrappers.h | 52 +++++++++----------- source/distributed/p4est_wrappers.cc | 4 -- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/include/deal.II/distributed/p4est_wrappers.h b/include/deal.II/distributed/p4est_wrappers.h index 44e9b95665..b703377b03 100644 --- a/include/deal.II/distributed/p4est_wrappers.h +++ b/include/deal.II/distributed/p4est_wrappers.h @@ -83,39 +83,35 @@ namespace internal template <> struct types<2> { - using connectivity = p4est_connectivity_t; - using forest = p4est_t; - using tree = p4est_tree_t; - using quadrant = p4est_quadrant_t; - using quadrant_coord = p4est_qcoord_t; - using topidx = p4est_topidx_t; - using locidx = p4est_locidx_t; - using gloidx = p4est_gloidx_t; - using balance_type = p4est_connect_type_t; - using ghost = p4est_ghost_t; - using transfer_context = p4est_transfer_context_t; -# ifdef P4EST_SEARCH_LOCAL + using connectivity = p4est_connectivity_t; + using forest = p4est_t; + using tree = p4est_tree_t; + using quadrant = p4est_quadrant_t; + using quadrant_coord = p4est_qcoord_t; + using topidx = p4est_topidx_t; + using locidx = p4est_locidx_t; + using gloidx = p4est_gloidx_t; + using balance_type = p4est_connect_type_t; + using ghost = p4est_ghost_t; + using transfer_context = p4est_transfer_context_t; using search_partition_callback = p4est_search_partition_t; -# endif }; template <> struct types<3> { - using connectivity = p8est_connectivity_t; - using forest = p8est_t; - using tree = p8est_tree_t; - using quadrant = p8est_quadrant_t; - using quadrant_coord = p4est_qcoord_t; - using topidx = p4est_topidx_t; - using locidx = p4est_locidx_t; - using gloidx = p4est_gloidx_t; - using balance_type = p8est_connect_type_t; - using ghost = p8est_ghost_t; - using transfer_context = p8est_transfer_context_t; -# ifdef P4EST_SEARCH_LOCAL + using connectivity = p8est_connectivity_t; + using forest = p8est_t; + using tree = p8est_tree_t; + using quadrant = p8est_quadrant_t; + using quadrant_coord = p4est_qcoord_t; + using topidx = p4est_topidx_t; + using locidx = p4est_locidx_t; + using gloidx = p4est_gloidx_t; + using balance_type = p8est_connect_type_t; + using ghost = p8est_ghost_t; + using transfer_context = p8est_transfer_context_t; using search_partition_callback = p8est_search_partition_t; -# endif }; @@ -315,14 +311,12 @@ namespace internal static void (&transfer_custom_end)(types<2>::transfer_context *tc); -# ifdef P4EST_SEARCH_LOCAL static void (&search_partition)( types<2>::forest *forest, int call_post, types<2>::search_partition_callback quadrant_fn, types<2>::search_partition_callback point_fn, sc_array_t *points); -# endif static void (&quadrant_coord_to_vertex)( types<2>::connectivity *connectivity, @@ -515,14 +509,12 @@ namespace internal static void (&transfer_custom_end)(types<3>::transfer_context *tc); -# ifdef P4EST_SEARCH_LOCAL static void (&search_partition)( types<3>::forest *forest, int call_post, types<3>::search_partition_callback quadrant_fn, types<3>::search_partition_callback point_fn, sc_array_t *points); -# endif static void (&quadrant_coord_to_vertex)( types<3>::connectivity *connectivity, diff --git a/source/distributed/p4est_wrappers.cc b/source/distributed/p4est_wrappers.cc index 49e128803a..471e1ac6ef 100644 --- a/source/distributed/p4est_wrappers.cc +++ b/source/distributed/p4est_wrappers.cc @@ -534,14 +534,12 @@ namespace internal void (&functions<2>::transfer_custom_end)(types<2>::transfer_context *tc) = p4est_transfer_custom_end; -# ifdef P4EST_SEARCH_LOCAL void (&functions<2>::search_partition)( types<2>::forest *p4est, int call_post, types<2>::search_partition_callback quadrant_fn, types<2>::search_partition_callback point_fn, sc_array_t *points) = p4est_search_partition; -# endif void (&functions<2>::quadrant_coord_to_vertex)( types<2>::connectivity *connectivity, @@ -756,14 +754,12 @@ namespace internal void (&functions<3>::transfer_custom_end)(types<3>::transfer_context *tc) = p8est_transfer_custom_end; -# ifdef P4EST_SEARCH_LOCAL void (&functions<3>::search_partition)( types<3>::forest *p4est, int call_post, types<3>::search_partition_callback quadrant_fn, types<3>::search_partition_callback point_fn, sc_array_t *points) = p8est_search_partition; -# endif void (&functions<3>::quadrant_coord_to_vertex)( types<3>::connectivity *connectivity, -- 2.39.5