From: David Wells Date: Fri, 23 May 2025 19:09:14 +0000 (-0400) Subject: Remove (void) etc. casts for AssertNothrow() variables. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18496%2Fhead;p=dealii.git Remove (void) etc. casts for AssertNothrow() variables. These shouldn't be needed now. --- diff --git a/include/deal.II/base/hdf5.h b/include/deal.II/base/hdf5.h index 50aa7fa5a2..3d18f882f2 100644 --- a/include/deal.II/base/hdf5.h +++ b/include/deal.II/base/hdf5.h @@ -1310,7 +1310,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Tclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); @@ -1333,7 +1332,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Tclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); *t_type = H5Tcreate(H5T_COMPOUND, sizeof(std::complex)); diff --git a/source/base/hdf5.cc b/source/base/hdf5.cc index a95ef9e410..b825130c1e 100644 --- a/source/base/hdf5.cc +++ b/source/base/hdf5.cc @@ -95,7 +95,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Dclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); dataspace = std::shared_ptr(new hid_t, [](hid_t *pointer) { @@ -104,7 +103,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Sclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); @@ -154,7 +152,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Dclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); dataspace = std::shared_ptr(new hid_t, [](hid_t *pointer) { @@ -163,7 +160,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Sclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); @@ -331,7 +327,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t ret = H5Gclose(*pointer); AssertNothrow(ret >= 0, ExcInternalError()); - (void)ret; delete pointer; }); switch (mode) @@ -420,7 +415,6 @@ namespace HDF5 // Release the HDF5 resource const herr_t err = H5Fclose(*pointer); AssertNothrow(err >= 0, ExcInternalError()); - (void)err; delete pointer; }); diff --git a/source/base/init_finalize.cc b/source/base/init_finalize.cc index 9d95b6fa59..d52369441a 100644 --- a/source/base/init_finalize.cc +++ b/source/base/init_finalize.cc @@ -427,8 +427,7 @@ InitFinalize::finalize() } else { - [[maybe_unused]] const int ierr = MPI_Finalize(); - + const int ierr = MPI_Finalize(); AssertNothrow(ierr == MPI_SUCCESS, dealii::ExcMPI(ierr)); } } diff --git a/source/base/mpi.cc b/source/base/mpi.cc index f3cc845fe1..9606215d30 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -241,10 +241,8 @@ namespace Utilities auto deleter = [](MPI_Datatype *p) { if (p != nullptr) { - [[maybe_unused]] const int ierr = MPI_Type_free(p); - + const int ierr = MPI_Type_free(p); AssertNothrow(ierr == MPI_SUCCESS, ExcMPI(ierr)); - delete p; } }; diff --git a/source/lac/petsc_matrix_base.cc b/source/lac/petsc_matrix_base.cc index da5ea634d3..82bfdbbb9e 100644 --- a/source/lac/petsc_matrix_base.cc +++ b/source/lac/petsc_matrix_base.cc @@ -112,7 +112,6 @@ namespace PETScWrappers MatrixBase::~MatrixBase() { PetscErrorCode ierr = MatDestroy(&matrix); - (void)ierr; AssertNothrow(ierr == 0, ExcPETScError(ierr)); } diff --git a/source/lac/petsc_parallel_block_sparse_matrix.cc b/source/lac/petsc_parallel_block_sparse_matrix.cc index 8f35e8590a..2d2afcf8de 100644 --- a/source/lac/petsc_parallel_block_sparse_matrix.cc +++ b/source/lac/petsc_parallel_block_sparse_matrix.cc @@ -79,7 +79,6 @@ namespace PETScWrappers BlockSparseMatrix::~BlockSparseMatrix() { PetscErrorCode ierr = MatDestroy(&petsc_nest_matrix); - (void)ierr; AssertNothrow(ierr == 0, ExcPETScError(ierr)); } diff --git a/source/lac/petsc_parallel_sparse_matrix.cc b/source/lac/petsc_parallel_sparse_matrix.cc index 40c361ab49..bfdef42de9 100644 --- a/source/lac/petsc_parallel_sparse_matrix.cc +++ b/source/lac/petsc_parallel_sparse_matrix.cc @@ -48,7 +48,6 @@ namespace PETScWrappers SparseMatrix::~SparseMatrix() { PetscErrorCode ierr = MatDestroy(&matrix); - (void)ierr; AssertNothrow(ierr == 0, ExcPETScError(ierr)); } diff --git a/source/lac/petsc_vector_base.cc b/source/lac/petsc_vector_base.cc index a21266ac34..cf84b58d23 100644 --- a/source/lac/petsc_vector_base.cc +++ b/source/lac/petsc_vector_base.cc @@ -149,7 +149,6 @@ namespace PETScWrappers const PetscErrorCode ierr = PetscObjectReference(reinterpret_cast(vector)); AssertNothrow(ierr == 0, ExcPETScError(ierr)); - (void)ierr; this->determine_ghost_indices(); } @@ -159,7 +158,6 @@ namespace PETScWrappers { const PetscErrorCode ierr = VecDestroy(&vector); AssertNothrow(ierr == 0, ExcPETScError(ierr)); - (void)ierr; } diff --git a/source/lac/slepc_solver.cc b/source/lac/slepc_solver.cc index df76220b5b..b0db9bc67d 100644 --- a/source/lac/slepc_solver.cc +++ b/source/lac/slepc_solver.cc @@ -64,8 +64,6 @@ namespace SLEPcWrappers { // Destroy the solver object. const PetscErrorCode ierr = EPSDestroy(&eps); - - (void)ierr; AssertNothrow(ierr == 0, ExcSLEPcError(ierr)); } } diff --git a/source/lac/slepc_spectral_transformation.cc b/source/lac/slepc_spectral_transformation.cc index a6f1045e60..a2cec022dc 100644 --- a/source/lac/slepc_spectral_transformation.cc +++ b/source/lac/slepc_spectral_transformation.cc @@ -39,7 +39,6 @@ namespace SLEPcWrappers if (st != nullptr) { const PetscErrorCode ierr = STDestroy(&st); - (void)ierr; AssertNothrow(ierr == 0, SolverBase::ExcSLEPcError(ierr)); } }