Merge pull request #473 from sloede/msl/fix-nonstandard-types

Replace non-standard u_int64_t by t8_linearidx_t
DLR-AMR · Mar 15, 2023 · 348e6d8 · 348e6d8
2 parents 6fb519a + 1e840ef
commit 348e6d8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/doc/author_schlottke-lakemper.txt b/doc/author_schlottke-lakemper.txt
@@ -0,0 +1 @@
+I hereby place my contributions to t8code under the FreeBSD license. Michael Schlottke-Lakemper <[email protected]>
diff --git a/src/t8_schemes/t8_default/t8_default_prism/t8_default_prism_cxx.cxx b/src/t8_schemes/t8_default/t8_default_prism/t8_default_prism_cxx.cxx
@@ -386,7 +386,7 @@ t8_default_scheme_prism_c::t8_element_set_linear_id (t8_element_t *elem,
                                                      int level, uint64_t id)
 {
   T8_ASSERT (0 <= level && level <= T8_DPRISM_MAXLEVEL);
-  T8_ASSERT (0 <= id && id < ((u_int64_t) 1) << 3 * level);
+  T8_ASSERT (0 <= id && id < ((t8_linearidx_t) 1) << 3 * level);
 
   t8_dprism_init_linear_id ((t8_default_prism_t *) elem, level, id);
 
@@ -483,7 +483,7 @@ t8_default_scheme_prism_c::t8_element_general_function (const t8_element_t
   T8_ASSERT (*((int8_t *) outdata) == ((const t8_dprism_t *) elem)->tri.type);
 }
 
-u_int64_t
+t8_linearidx_t
   t8_default_scheme_prism_c::t8_element_get_linear_id (const t8_element_t
                                                        *elem, int level)
 {

diff --git a/src/t8_schemes/t8_default/t8_default_prism/t8_dprism_bits.c b/src/t8_schemes/t8_default/t8_default_prism/t8_dprism_bits.c
@@ -53,7 +53,7 @@ int
 t8_dprism_compare (const t8_dprism_t *p1, const t8_dprism_t *p2)
 {
   int                 maxlvl;
-  u_int64_t           id1, id2;
+  t8_linearidx_t      id1, id2;
   T8_ASSERT (p1->line.level == p1->tri.level);
   T8_ASSERT (p2->line.level == p2->tri.level);
 

diff --git a/src/t8_schemes/t8_default/t8_default_tet/t8_default_tet.c b/src/t8_schemes/t8_default/t8_default_tet/t8_default_tet.c
@@ -59,7 +59,7 @@ static int
 t8_default_tet_compare (const t8_element_t *elem1, const t8_element_t *elem2)
 {
   int                 maxlvl;
-  u_int64_t           id1, id2;
+  t8_linearidx_t      id1, id2;
 
   /* Compute the bigger level of the two */
   maxlvl = SC_MAX (t8_default_tet_level (elem1),