Fix build issues on recent Fedora releases, GH-860

libgeos · Apr 6, 2023 · 5fe03b6 · 5fe03b6
1 parent 2d5dd0d
commit 5fe03b6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,7 @@
   - Tri: add exceptions for invalid indexes (GH-853, Martin Davis)
   - OffsetCurve: handle zero-distance offsets (GH-850, Martin Davis)
   - LargestEmptyCircle: enhance boundary to allow any polygonal geometry (GH-859, Martin Davis)
+  - Build issues with RH (GH-860)
 
 
 ## Changes in 3.11.2

diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h
@@ -16,8 +16,8 @@
 #pragma once
 
 #include <geos/export.h>
-#include <string>
 #include <cstdint>
+#include <string>
 
 // Forward declarations
 namespace geos {

diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h
@@ -16,6 +16,7 @@
 #pragma once
 
 #include <geos/export.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 

diff --git a/tests/unit/capi/GEOSMakeValidTest.cpp b/tests/unit/capi/GEOSMakeValidTest.cpp
@@ -7,6 +7,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
+#include <cstdint>
 #include <cmath>
 #include <cstring>
 

diff --git a/tests/unit/math/DDTest.cpp b/tests/unit/math/DDTest.cpp
@@ -164,7 +164,7 @@ struct test_dd_data {
         DD d(1.0);
         int sign = 1;
         while (t.doubleValue() > eps) {
-            k++;
+            k = k + 1;
             if (sign < 0)
                 at = at - (t / d);
             else
@@ -190,7 +190,7 @@ struct test_dd_data {
         int i = 0;
         while(t.doubleValue() > eps)
         {
-            i++;
+            i = i + 1;
             n += 1.0;
             t = t / DD(n);
             s = s + t;