From 4f2de45d4673538e10893e032ed012f95138ea93 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 22 Aug 2017 09:50:06 -0600 Subject: [PATCH] Use 'destroyed' instead of 'destructed'. --- examples/step-13/step-13.cc | 2 +- include/deal.II/base/thread_management.h | 2 +- include/deal.II/lac/petsc_vector_base.h | 2 +- tests/bits/joa_1.cc | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/step-13/step-13.cc b/examples/step-13/step-13.cc index f2f07d3d9d..fdbd9ffafe 100644 --- a/examples/step-13/step-13.cc +++ b/examples/step-13/step-13.cc @@ -497,7 +497,7 @@ namespace Step13 // which uses a counter in the triangulation class to denote the fact that // there is still an object out there using this triangulation, thus // leading to an abort in case the triangulation is attempted to be - // destructed while this object still uses it. + // destroyed while this object still uses it. // // Note that while the pointer itself is declared constant // (i.e. throughout the lifetime of this object, the pointer points to the diff --git a/include/deal.II/base/thread_management.h b/include/deal.II/base/thread_management.h index d22862debc..778c0411b7 100644 --- a/include/deal.II/base/thread_management.h +++ b/include/deal.II/base/thread_management.h @@ -1004,7 +1004,7 @@ namespace Threads * While we have only one of these objects per thread, several * Threads::Thread objects may refer to this descriptor. If all Thread * objects go out of scope the ThreadDescriptor will detach from the - * thread before being destructed. + * thread before being destroyed. */ template struct ThreadDescriptor diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index 2158da9ea6..d3103585e5 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -740,7 +740,7 @@ namespace PETScWrappers /** * Specifies if the vector is the owner of the PETSc Vec. This is true if - * it got created by this class and determines if it gets destructed in + * it got created by this class and determines if it gets destroyed in * the destructor. */ bool obtained_ownership; diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index f923afc7ee..d7df30f75f 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -299,7 +299,7 @@ LaplaceProblem::LaplaceProblem () : // is wrong, namely that some other // object is still using the object // that is presently being -// destructed, but most of the time +// destroyed, but most of the time // not who this user is. It is // therefore often rather // time-consuming to find out where @@ -325,17 +325,17 @@ LaplaceProblem::LaplaceProblem () : // above. The reason is that member // variables of the // LaplaceProblem class are -// destructed bottom-up (i.e. in +// destroyed bottom-up (i.e. in // reverse order of their declaration // in the class), as always in // C++. Thus, the finite element -// object will be destructed before +// object will be destroyed before // the DoF handler object, since its // declaration is below the one of // the DoF handler. This triggers the // situation above, and an exception // will be raised when the fe -// object is destructed. What needs +// object is destroyed. What needs // to be done is to tell the // dof_handler object to release // its lock to the finite element. Of -- 2.39.5