diff --git a/Makefile b/Makefile index 18a297797eb..f6bd1003faa 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team ======= <<<<<<< HEAD @@ -47,6 +48,8 @@ >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # COPYRIGHT: (C) 2002-2024 by the GRASS Development Team ======= # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team @@ -71,6 +74,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= # COPYRIGHT: (C) 2002-2023 by the GRASS Development Team >>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724)) @@ -112,6 +116,8 @@ # COPYRIGHT: (C) 2002-2022 by the GRASS Development Team >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) +======= +>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660)) # # This program is free software under the GNU General Public # License (>=v2). Read the file COPYING that comes with GRASS diff --git a/REQUIREMENTS.html b/REQUIREMENTS.html index d4288728c6e..e2212406aff 100644 --- a/REQUIREMENTS.html +++ b/REQUIREMENTS.html @@ -359,6 +359,7 @@
Please report bugs here:
By specifying the number of parallel processes with nprocs option,
r.resamp.filter can run faster, see benchmarks below.
@@ -166,6 +171,7 @@
https://grass.osgeo.org/contribute/
diff --git a/configure.ac b/configure.ac
index 52c2d6e7d3c..33edcbcc3bc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
=======
<<<<<<< HEAD
@@ -47,6 +48,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# COPYRIGHT: (C) 2000-2024 by the GRASS Development Team
=======
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
@@ -71,6 +74,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -112,6 +116,8 @@
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
diff --git a/grasslib.dox b/grasslib.dox
index 5e67e68fed2..0698c2af51e 100644
--- a/grasslib.dox
+++ b/grasslib.dox
@@ -15,6 +15,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
* updated 8/2005, 2006-2008, 2010-2011, 2017-2023
=======
@@ -53,6 +54,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
* updated 8/2005, 2006-2024
=======
* updated 8/2005, 2006-2008, 2010-2011, 2017, 2018, 2019, 2021
@@ -93,6 +96,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
* updated 8/2005, 2006-2008, 2010-2011, 2017-2023
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -148,6 +152,8 @@
* updated 8/2005, 2006-2008, 2010-2011, 2017-2022
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
-->
GRASS GIS (Geographic
@@ -180,6 +186,7 @@ pages.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
© 2000-2023 by the GRASS Development Team
=======
<<<<<<< HEAD
@@ -207,6 +214,8 @@ pages.
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
© 2000-2024 by the GRASS Development Team
=======
© 2000-2022 by the GRASS Development Team
@@ -231,6 +240,7 @@ pages.
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
© 2000-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -272,6 +282,8 @@ pages.
© 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
This manual is published under GNU Free Documentation
diff --git a/gui/wxpython/gui_core/goutput.py b/gui/wxpython/gui_core/goutput.py
index 36231f2ede8..ac23d6512b7 100644
--- a/gui/wxpython/gui_core/goutput.py
+++ b/gui/wxpython/gui_core/goutput.py
@@ -50,6 +50,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
=======
<<<<<<< HEAD
@@ -66,6 +67,8 @@
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
from gui_core.wrap import Button, ClearButton, StaticText
=======
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
@@ -74,6 +77,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
@@ -101,6 +105,8 @@
from gui_core.wrap import Button, ClearButton, StaticText, StaticBox
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
from core.settings import UserSettings
@@ -207,6 +213,7 @@ def __init__(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
@@ -222,6 +229,8 @@ def __init__(
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
self.btnClear.Bind(wx.EVT_BUTTON, self.OnClear)
self.btnOutputSave.Bind(wx.EVT_BUTTON, self.OnOutputSave)
@@ -231,6 +240,7 @@ def __init__(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
<<<<<<< HEAD
@@ -254,6 +264,8 @@ def __init__(
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
self.btnCmdExportHistory = Button(parent=self.panelOutput, id=wx.ID_ANY)
self.btnCmdExportHistory.SetLabel(_("&Export history"))
self.btnCmdExportHistory.SetToolTip(
@@ -276,6 +288,7 @@ def __init__(
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
@@ -310,6 +323,9 @@ def __init__(
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
+=======
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
self._layout()
@@ -604,6 +620,7 @@ def OnCmdProgress(self, event):
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
@@ -639,6 +656,9 @@ def OnCmdProgress(self, event):
=======
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
>>>>>>> osgeo-main
+=======
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
def OnCmdExportHistory(self, event):
"""Export the history of executed commands stored
in a .wxgui_history file to a selected file."""
diff --git a/imagery/i.maxlik/main.c b/imagery/i.maxlik/main.c
index ba69561619b..5c5167eda8b 100644
--- a/imagery/i.maxlik/main.c
+++ b/imagery/i.maxlik/main.c
@@ -240,10 +240,13 @@ int main(int argc, char *argv[])
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
if (Rast_is_c_null_value(&class_cell[col]) == 0)
class_cell[col] = S.sig[class_cell[col] - 1].oclass;
=======
@@ -292,6 +295,7 @@ int main(int argc, char *argv[])
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724))
=======
@@ -350,6 +354,8 @@ int main(int argc, char *argv[])
class_cell[col] = S.sig[class_cell[col] - 1].oclass;
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
}
}
Rast_put_row(class_fd, class_cell, CELL_TYPE);
diff --git a/imagery/i.maxlik/testsuite/test_i_maxlik.py b/imagery/i.maxlik/testsuite/test_i_maxlik.py
index f99815fc4c7..563bb7ddc13 100644
--- a/imagery/i.maxlik/testsuite/test_i_maxlik.py
+++ b/imagery/i.maxlik/testsuite/test_i_maxlik.py
@@ -77,10 +77,13 @@ def setUpClass(cls):
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> 630833279b (i.maxlik: fix crash when classification result is NULL (#2724))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))",
=======
<<<<<<< HEAD
@@ -122,6 +125,7 @@ def setUpClass(cls):
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
expression=f"{cls.b2}=if(row() == 3 && col() == 3, null(), 5.0+rand(-1.0,1.0))",
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -177,6 +181,8 @@ def setUpClass(cls):
expression=f"{cls.b2}=5.0+rand(-1.0,1.0)",
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
flags="s",
quiet=True,
)
diff --git a/include/VERSION b/include/VERSION
index 8e4c3176717..aabf38ac82d 100644
--- a/include/VERSION
+++ b/include/VERSION
@@ -147,6 +147,7 @@ dev
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
2023
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -204,3 +205,5 @@ dev
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
diff --git a/include/grass/gis.h b/include/grass/gis.h
index 7d0b39fbb9f..30eb806e641 100644
--- a/include/grass/gis.h
+++ b/include/grass/gis.h
@@ -20,6 +20,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
* COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
=======
@@ -58,6 +59,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
* COPYRIGHT: (C) 2000-2024 by the GRASS Development Team
=======
* COPYRIGHT: (C) 2000-2021 by the GRASS Development Team
@@ -98,6 +101,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
* COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -153,6 +157,8 @@
* COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
diff --git a/lib/gis/env.c b/lib/gis/env.c
index 95bc586cdc9..254e0d905c1 100644
--- a/lib/gis/env.c
+++ b/lib/gis/env.c
@@ -13,6 +13,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
(C) 2001-2023 by the GRASS Development Team
=======
@@ -41,6 +42,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
(C) 2001-2024 by the GRASS Development Team
=======
(C) 2001-2022 by the GRASS Development Team
@@ -65,6 +68,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
(C) 2001-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -106,6 +110,8 @@
(C) 2001-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
diff --git a/lib/gis/gislib_cmdline_parsing.dox b/lib/gis/gislib_cmdline_parsing.dox
index 52e4f796ad7..b67cce0b159 100644
--- a/lib/gis/gislib_cmdline_parsing.dox
+++ b/lib/gis/gislib_cmdline_parsing.dox
@@ -15,6 +15,7 @@ extracted form gislib.dox and improved by Vaclav Petras, 2013
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
Copyright 2004-2023 by the GRASS Development Team
=======
<<<<<<< HEAD
@@ -42,6 +43,8 @@ Copyright 2004-2023 by the GRASS Development Team
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
Copyright 2004-2024 by the GRASS Development Team
=======
Copyright 2004-2022 by the GRASS Development Team
@@ -66,6 +69,7 @@ Copyright 2004-2023 by the GRASS Development Team
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
Copyright 2004-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -107,6 +111,8 @@ Copyright 2004-2023 by the GRASS Development Team
Copyright 2004-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
Published under GNU Free Documentation License
-->
diff --git a/lib/gis/parser_html.c b/lib/gis/parser_html.c
index 07638702c4b..bc3e216745c 100644
--- a/lib/gis/parser_html.c
+++ b/lib/gis/parser_html.c
@@ -13,6 +13,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
(C) 2001-2023 by the GRASS Development Team
=======
@@ -41,6 +42,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
(C) 2001-2024 by the GRASS Development Team
=======
(C) 2001-2022 by the GRASS Development Team
@@ -65,6 +68,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
(C) 2001-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -106,6 +110,8 @@
(C) 2001-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
diff --git a/lib/init/grass.py b/lib/init/grass.py
index 5e3f986125c..e31d8eb5205 100755
--- a/lib/init/grass.py
+++ b/lib/init/grass.py
@@ -29,6 +29,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
=======
<<<<<<< HEAD
@@ -56,6 +57,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# COPYRIGHT: (C) 2000-2024 by the GRASS Development Team
=======
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
@@ -80,6 +83,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -121,6 +125,8 @@
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
diff --git a/lib/init/grass.sh b/lib/init/grass.sh
index 0bc4a675957..816946f9197 100755
--- a/lib/init/grass.sh
+++ b/lib/init/grass.sh
@@ -24,6 +24,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
=======
<<<<<<< HEAD
@@ -51,6 +52,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# COPYRIGHT: (C) 2000-2024 by the GRASS Development Team
=======
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
@@ -75,6 +78,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
# COPYRIGHT: (C) 2000-2023 by the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -116,6 +120,8 @@
# COPYRIGHT: (C) 2000-2022 by the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
#
# This program is free software under the GNU General
# Public License (>=v2). Read the file COPYING that
diff --git a/man/build_graphical_index.py b/man/build_graphical_index.py
index 49b7a0bb273..83ef5dde481 100755
--- a/man/build_graphical_index.py
+++ b/man/build_graphical_index.py
@@ -16,6 +16,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
=======
<<<<<<< HEAD
@@ -43,6 +44,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# COPYRIGHT: (C) 2015-2024 by Vaclav Petras and the GRASS Development Team
=======
# COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team
@@ -67,6 +70,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
# COPYRIGHT: (C) 2015-2023 by Vaclav Petras and the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -108,6 +112,8 @@
# COPYRIGHT: (C) 2015-2022 by Vaclav Petras and the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
#
# This program is free software under the GNU General Public
# License (>=v2). Read the file COPYING that comes with GRASS
diff --git a/man/build_html.py b/man/build_html.py
index cac5fa14a5e..67027981473 100644
--- a/man/build_html.py
+++ b/man/build_html.py
@@ -12,6 +12,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# (C) 2003-2023 Markus Neteler and the GRASS Development Team
=======
<<<<<<< HEAD
@@ -39,6 +40,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# (C) 2003-2024 Markus Neteler and the GRASS Development Team
=======
# (C) 2003-2022 Markus Neteler and the GRASS Development Team
@@ -63,6 +66,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
# (C) 2003-2023 Markus Neteler and the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -104,6 +108,8 @@
# (C) 2003-2022 Markus Neteler and the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# Authors:
# Markus Neteler
# Glynn Clements
diff --git a/man/build_rest.py b/man/build_rest.py
index a614c9faffc..1726ee679e8 100644
--- a/man/build_rest.py
+++ b/man/build_rest.py
@@ -20,6 +20,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
=======
<<<<<<< HEAD
@@ -47,6 +48,8 @@
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
# (C) 2003-2024 by Luca Delucchi and the GRASS Development Team
=======
# (C) 2003-2022 by Luca Delucchi and the GRASS Development Team
@@ -71,6 +74,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
# (C) 2003-2023 by Luca Delucchi and the GRASS Development Team
>>>>>>> 6104ec7096 (i.maxlik: fix crash when classification result is NULL (#2724))
@@ -112,6 +116,8 @@
# (C) 2003-2022 by Luca Delucchi and the GRASS Development Team
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
import os
import string
@@ -281,6 +287,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
2003-2023 `GRASS Development Team NOTES
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
@@ -129,6 +130,10 @@ NOTES
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+=======
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
PERFORMANCE
PERFORMANCE
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@@ -192,6 +198,8 @@ PERFORMANCE
=======
>>>>>>> osgeo-main
=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
+=======
>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
@@ -200,6 +208,7 @@ PERFORMANCE
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> osgeo-main
=======
@@ -234,6 +243,10 @@ PERFORMANCE
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+=======
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
SEE ALSO
diff --git a/raster/r.terraflow/ccforest.h b/raster/r.terraflow/ccforest.h
index 723b0493623..1426ec37e74 100644
--- a/raster/r.terraflow/ccforest.h
+++ b/raster/r.terraflow/ccforest.h
@@ -51,6 +51,7 @@ class keyvalue {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
@@ -69,6 +70,8 @@ class keyvalue {
=======
>>>>>>> osgeo-main
=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
+=======
=======
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
=======
@@ -128,6 +131,7 @@ class keyvalue {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
=======
@@ -172,6 +176,8 @@ class keyvalue {
=======
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
int operator!=(const keyvalue &e2) const
{
return (key != e2.key) || (value != e2.value);
@@ -284,6 +290,7 @@ class ccforest {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
@@ -324,6 +331,10 @@ class ccforest {
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+=======
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
ccforest(const ccforest &) = delete;
ccforest &operator=(const ccforest &) = delete;
ccforest(ccforest &&) = delete;
@@ -336,6 +347,9 @@ class ccforest {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660))
=======
@@ -364,6 +378,7 @@ class ccforest {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
=======
@@ -421,6 +436,8 @@ class ccforest {
~ccforest();
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
void insert(const T &i, const T &j); /* insert edge (i,j) */
T findNextRoot(const T &i); /* find root where i >= prev i */
void printRootStream();
diff --git a/raster/r.terraflow/genericWindow.h b/raster/r.terraflow/genericWindow.h
index c9166a71877..6f19574c8d7 100644
--- a/raster/r.terraflow/genericWindow.h
+++ b/raster/r.terraflow/genericWindow.h
@@ -96,6 +96,7 @@ class genericWindow {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
@@ -145,6 +146,10 @@ class genericWindow {
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+=======
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
/* get specified neighbour di,dj in {-1,0,1} */
T get(short di, short dj) const
{
diff --git a/raster/r.terraflow/sweep.h b/raster/r.terraflow/sweep.h
index cbb959a395f..1bc6805b460 100644
--- a/raster/r.terraflow/sweep.h
+++ b/raster/r.terraflow/sweep.h
@@ -397,10 +397,13 @@ class flowPriority {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> fc6ae6c77c (r.terrafow: explicit use of default constructors (#2660))
=======
>>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
elevation_type h{0.0};
toporank_type toporank{0};
=======
@@ -451,6 +454,7 @@ class flowPriority {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
>>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
=======
@@ -516,6 +520,8 @@ class flowPriority {
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
/* points at same heights are processed in increasing order of their
topological rank; overall, this gives topological order and
guarantees that flow is never puhsed backwards. Note: of course,
@@ -531,6 +537,7 @@ class flowPriority {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
@@ -562,6 +569,8 @@ class flowPriority {
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
dimension_type i{0}, j{0};
public:
@@ -727,20 +736,24 @@ class flowPriority {
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
dimension_type i, j;
+=======
+ dimension_type i{0}, j{0};
+>>>>>>> 021dfb5d52 (r.terrafow: explicit use of default constructors (#2660))
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(const flowPriority &p)
- : h(p.h), toporank(p.toporank), i(p.i), j(p.j)
+ flowPriority() {}
+ flowPriority(elevation_type a) : h{a} {}
+ flowPriority(elevation_type a, toporank_type b, dimension_type c,
+ dimension_type d)
+ : h{a}, toporank{b}, i{c}, j{d}
{
}
- ~flowPriority() {}
+ flowPriority(const flowPriority &) = default;
+ flowPriority &operator=(const flowPriority &) = default;
+ flowPriority(flowPriority &&) = default;
+ flowPriority &operator=(flowPriority &&) = default;
+ ~flowPriority() = default;
elevation_type field1() const { return h; }
@@ -1032,6 +1045,7 @@ class sweepItemBaseType {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
@@ -1063,6 +1077,8 @@ class sweepItemBaseType {
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> b4675dccbc (r.terrafow: explicit use of default constructors (#2660))
/* return the elevation window */
genericWindow