Merge ../develop into f2003-examples2

LLNL · Feb 7, 2024 · b24ec64 · b24ec64
2 parents 097cdbf + 0def400
commit b24ec64
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -158,6 +158,10 @@ sundials_dense.h
 sundials_band.h
 ```
 
+### Minor Changes
+
+Fixed [#329](https://github.com/LLNL/sundials/issues/329) so that C++20 aggregate initialization can be used.
+
 ## Changes to SUNDIALS in release 6.7.0
 
 Added the `SUNAdaptController` base class, ported ARKODE's internal

diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
@@ -314,6 +314,11 @@ rely on these are recommended to transition to the corresponding :c:type:`SUNMat
   sundials_dense.h
   sundials_band.h
 
+**Minor changes**
+
+Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
+that C++20 aggregate initialization can be used.
+
 Changes in v5.7.0
 -----------------
 

diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
@@ -284,6 +284,11 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
    sundials_dense.h
    sundials_band.h
 
+**Minor changes**
+
+Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
+that C++20 aggregate initialization can be used.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
@@ -284,6 +284,11 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
    sundials_dense.h
    sundials_band.h
 
+**Minor changes**
+
+Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
+that C++20 aggregate initialization can be used.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
@@ -245,6 +245,11 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
    sundials_dense.h
    sundials_band.h
 
+**Minor changes**
+
+Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
+that C++20 aggregate initialization can be used.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
@@ -259,6 +259,11 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
    sundials_dense.h
    sundials_band.h
 
+**Minor changes**
+
+Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
+that C++20 aggregate initialization can be used.
+
 Changes in v5.7.0
 -----------------
 

diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
@@ -240,6 +240,11 @@ corresponding :c:type:`SUNMatrix` and :c:type:`SUNLinearSolver` modules:
    sundials_dense.h
    sundials_band.h
 
+**Minor changes**
+
+Fixed `GitHub Issue #329 <https://github.com/LLNL/sundials/issues/329>`_ so
+that C++20 aggregate initialization can be used.
+
 Changes in v6.7.0
 -----------------
 

diff --git a/include/sundials/sundials_linearsolver.h b/include/sundials/sundials_linearsolver.h
@@ -128,9 +128,6 @@ struct _generic_SUNLinearSolver_Ops
   SUNErrCode (*space)(SUNLinearSolver, long int*, long int*);
   N_Vector (*resid)(SUNLinearSolver);
   SUNErrCode (*free)(SUNLinearSolver);
-#ifdef __cplusplus
-  _generic_SUNLinearSolver_Ops() = default;
-#endif
 };
 
 /* A linear solver is a structure with an implementation-dependent
@@ -141,9 +138,6 @@ struct _generic_SUNLinearSolver
   void* content;
   SUNLinearSolver_Ops ops;
   SUNContext sunctx;
-#ifdef __cplusplus
-  _generic_SUNLinearSolver() = default;
-#endif
 };
 
 /* -----------------------------------------------------------------

diff --git a/include/sundials/sundials_matrix.h b/include/sundials/sundials_matrix.h
@@ -94,9 +94,6 @@ struct _generic_SUNMatrix_Ops
   SUNErrCode (*matvecsetup)(SUNMatrix);
   SUNErrCode (*matvec)(SUNMatrix, N_Vector, N_Vector);
   SUNErrCode (*space)(SUNMatrix, long int*, long int*);
-#ifdef __cplusplus
-  _generic_SUNMatrix_Ops() = default;
-#endif
 };
 
 /* A matrix is a structure with an implementation-dependent
@@ -107,9 +104,6 @@ struct _generic_SUNMatrix
   void* content;
   SUNMatrix_Ops ops;
   SUNContext sunctx;
-#ifdef __cplusplus
-  _generic_SUNMatrix() = default;
-#endif
 };
 
 /* -----------------------------------------------------------------

diff --git a/include/sundials/sundials_nonlinearsolver.h b/include/sundials/sundials_nonlinearsolver.h
@@ -113,9 +113,6 @@ struct _generic_SUNNonlinearSolver_Ops
   SUNErrCode (*getnumiters)(SUNNonlinearSolver, long int*);
   SUNErrCode (*getcuriter)(SUNNonlinearSolver, int*);
   SUNErrCode (*getnumconvfails)(SUNNonlinearSolver, long int*);
-#ifdef __cplusplus
-  _generic_SUNNonlinearSolver_Ops() = default;
-#endif
 };
 
 /* A nonlinear solver is a structure with an implementation-dependent 'content'
@@ -126,9 +123,6 @@ struct _generic_SUNNonlinearSolver
   void* content;
   SUNNonlinearSolver_Ops ops;
   SUNContext sunctx;
-#ifdef __cplusplus
-  _generic_SUNNonlinearSolver() = default;
-#endif
 };
 
 /* -----------------------------------------------------------------------------

diff --git a/include/sundials/sundials_nvector.h b/include/sundials/sundials_nvector.h
@@ -189,10 +189,6 @@ struct _generic_N_Vector_Ops
   /* Debugging functions (called when SUNDIALS_DEBUG_PRINTVEC is defined). */
   void (*nvprint)(N_Vector);
   void (*nvprintfile)(N_Vector, FILE*);
-
-#ifdef __cplusplus
-  _generic_N_Vector_Ops() = default;
-#endif
 };
 
 /* A vector is a structure with an implementation-dependent
@@ -203,9 +199,6 @@ struct _generic_N_Vector
   void* content;
   N_Vector_Ops ops;
   SUNContext sunctx;
-#ifdef __cplusplus
-  _generic_N_Vector() = default;
-#endif
 };
 
 /* -----------------------------------------------------------------