]> https://gitweb.dealii.org/ - dealii.git/commitdiff
compatibility fixes for p4est 1.0 10/head
authorTimo Heister <timo.heister@gmail.com>
Tue, 22 Jul 2014 10:48:37 +0000 (12:48 +0200)
committerTimo Heister <timo.heister@gmail.com>
Tue, 22 Jul 2014 20:38:47 +0000 (22:38 +0200)
The deprecated type p4est_connect_type_t got removed in p4est >=1.0. Use
connect_type_t instead.

include/deal.II/distributed/tria.h

index ea3e88bc09351e67242a032de29abf1b97001a5f..8daa70dd590d0c4e55fba19b8ce745842659ca34 100644 (file)
@@ -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;
     };
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.