formatting

nilason · Nov 21, 2022 · b0f2ff6 · b0f2ff6
1 parent 9ca17df
commit b0f2ff6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/raster/r.terraflow/ccforest.h b/raster/r.terraflow/ccforest.h
@@ -37,9 +37,9 @@ class keyvalue {
   keyvalue(T vk, T vv) : key(vk), value(vv) {};
 
   keyvalue(const keyvalue &) = default;
-  keyvalue& operator=(const keyvalue &) = default;
+  keyvalue &operator=(const keyvalue &) = default;
   keyvalue(keyvalue &&) = default;
-  keyvalue& operator=(keyvalue &&) = default;
+  keyvalue &operator=(keyvalue &&) = default;
   ~keyvalue() = default;
 
   T getPriority() const { return key; };

diff --git a/raster/r.terraflow/sweep.h b/raster/r.terraflow/sweep.h
@@ -178,14 +178,16 @@ class flowPriority {
   dimension_type i,j;
 
 public:
-  flowPriority(elevation_type a=0, toporank_type b=0,
-               dimension_type c=0, dimension_type d=0):
-  h(a), toporank(b), i(c), j(d) {}
+  flowPriority(elevation_type a = 0, toporank_type b = 0,
+               dimension_type c = 0, dimension_type d = 0)
+      : h(a), toporank(b), i(c), j(d)
+  {
+  }
 
   flowPriority(const flowPriority &) = default;
-  flowPriority& operator=(const flowPriority &) = default;
+  flowPriority &operator=(const flowPriority &) = default;
   flowPriority(flowPriority &&) = default;
-  flowPriority& operator=(flowPriority &&) = default;
+  flowPriority &operator=(flowPriority &&) = default;
   ~flowPriority() = default;
 
   elevation_type field1() const {
@@ -439,9 +441,9 @@ class flowValue {
   flowValue(flowaccumulation_type x=0): value(x) {}
 
   flowValue(const flowValue &) = default;
-  flowValue& operator=(const flowValue &) = default;
+  flowValue &operator=(const flowValue &) = default;
   flowValue(flowValue &&) = default;
-  flowValue& operator=(flowValue &&) = default;
+  flowValue &operator=(flowValue &&) = default;
   ~flowValue() = default;
 
   flowaccumulation_type get() const {
@@ -493,15 +495,17 @@ class flowStructure  {
 
 public:
 
-  flowStructure(const flowPriority &p = 0, const flowValue &e = 0):
-    prio(p), val(e) {}
-
+  flowStructure(const flowPriority &p = 0, const flowValue &e = 0)
+      : prio(p), val(e)
+  {
+  }
+
   flowStructure(const flowStructure &) = default;
-  flowStructure& operator=(const flowStructure &) = default;
+  flowStructure &operator=(const flowStructure &) = default;
   flowStructure(flowStructure &&) = default;
-  flowStructure& operator=(flowStructure &&) = default;
+  flowStructure &operator=(flowStructure &&) = default;
   ~flowStructure() = default;
-  
+
   flowPriority getPriority() const {
     return prio;
   }