From f3292e04d6bd714332efdfce3e832640a4996e8f Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Fri, 11 Oct 2024 15:17:31 -0400
Subject: [PATCH 1/2] checks: Remove extra semicolons in r.terraflow

With GCC and -Werror=pedantic, the r.terraflow C++ code produces errors because extra semicolons are present after some function definitions. This removes the semincolons and I no longer get 'error: extra ;'.
---
 raster/r.terraflow/fill.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/raster/r.terraflow/fill.cpp b/raster/r.terraflow/fill.cpp
index ab1629a3b7f..c7b54cd0a47 100644
--- a/raster/r.terraflow/fill.cpp
+++ b/raster/r.terraflow/fill.cpp
@@ -518,7 +518,7 @@ void assignFinalDirections(AMI_STREAM<plateauStats> *statstr,
             continue;
         }
     }
-};
+}
 
 /* ********************************************************************** */
 class directionElevationMerger {

From b32d86809863b05f6095610020cf4a702985e26e Mon Sep 17 00:00:00 2001
From: Vaclav Petras <wenzeslaus@gmail.com>
Date: Fri, 11 Oct 2024 15:19:00 -0400
Subject: [PATCH 2/2] More semicolons

---
 raster/r.terraflow/genericWindow.cpp | 2 +-
 raster/r.terraflow/sweep.cpp         | 2 +-
 raster/r.terraflow/weightWindow.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/raster/r.terraflow/genericWindow.cpp b/raster/r.terraflow/genericWindow.cpp
index 92b0852cd71..9b114773e2a 100644
--- a/raster/r.terraflow/genericWindow.cpp
+++ b/raster/r.terraflow/genericWindow.cpp
@@ -36,4 +36,4 @@ void fillPit(ElevationWindow &win)
     if (win.get(4) < min) {
         win.set(4, min);
     }
-};
+}
diff --git a/raster/r.terraflow/sweep.cpp b/raster/r.terraflow/sweep.cpp
index 2f7fba8bb13..c98b844b016 100644
--- a/raster/r.terraflow/sweep.cpp
+++ b/raster/r.terraflow/sweep.cpp
@@ -65,7 +65,7 @@ sweepOutput::sweepOutput()
 #ifdef OUTPUT_TCI
     tci = (tci_type)nodataType::ELEVATION_NODATA;
 #endif
-};
+}
 
 /* ------------------------------------------------------------ */
 /* computes output parameters of cell (i,j) given the flow value, the
diff --git a/raster/r.terraflow/weightWindow.cpp b/raster/r.terraflow/weightWindow.cpp
index ccf55a82ca9..760dccc6b5c 100644
--- a/raster/r.terraflow/weightWindow.cpp
+++ b/raster/r.terraflow/weightWindow.cpp
@@ -229,7 +229,7 @@ void weightWindow::compute(const dimension_type i, const dimension_type j,
         cout << form("%3.2f ", weight.get(l));
     cout << "]\n";
 #endif
-};
+}
 
 /* Find the dominant direction. Set corresponding weight to 1, and
    sets all other weights to 0. Set sumweight and sumcontour.*/