From dc0308a408360bfa5e21a58d10c2c2a7dca3a8ad Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Tue, 22 Jul 2014 12:48:37 +0200 Subject: [PATCH] compatibility fixes for p4est 1.0 The deprecated type p4est_connect_type_t got removed in p4est >=1.0. Use connect_type_t instead. --- include/deal.II/distributed/tria.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index ea3e88bc09..8daa70dd59 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -88,7 +88,11 @@ namespace internal typedef p4est_quadrant_t quadrant; typedef p4est_topidx_t topidx; typedef p4est_locidx_t locidx; +#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) + typedef p4est_connect_type_t balance_type; +#else typedef p4est_balance_type_t balance_type; +#endif typedef p4est_ghost_t ghost; }; @@ -101,7 +105,11 @@ namespace internal typedef p8est_quadrant_t quadrant; typedef p4est_topidx_t topidx; typedef p4est_locidx_t locidx; +#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) + typedef p8est_connect_type_t balance_type; +#else typedef p8est_balance_type_t balance_type; +#endif typedef p8est_ghost_t ghost; }; -- 2.39.5