Merge pull request #5080 from masterleinad/default_constructors

Default constructors and destructors

include/deal.II/algorithms/operator.h

@@ -73,7 +73,7 @@ namespace Algorithms
     /**
      * The virtual destructor.
      */
-    ~OperatorBase();
+    virtual ~OperatorBase() = default;
 
     /**
      * The actual operation, which is implemented in a derived class.
@@ -106,13 +106,22 @@ namespace Algorithms
   template <typename VectorType>
   class OutputOperator : public Subscriptor
   {
-    OutputOperator(const OutputOperator<VectorType> &);
   public:
+    /**
+     * Constructor initializing member variables with invalid data.
+     */
     OutputOperator ();
+
+    /**
+     * The copy constructor is deleted since objects of this class
+     * should not be copied.
+     */
+    OutputOperator(const OutputOperator<VectorType> &) = delete;
+
     /**
      * Empty virtual destructor.
      */
-    virtual ~OutputOperator();
+    virtual ~OutputOperator() = default;
 
     /**
      * Set the stream @p os to which data is written. If no stream is selected

include/deal.II/algorithms/operator.templates.h

@@ -25,10 +25,6 @@ DEAL_II_NAMESPACE_OPEN
 
 namespace Algorithms
 {
-  template <typename VectorType>
-  OutputOperator<VectorType>::~OutputOperator()
-  {}
-
   template <typename VectorType>
   OutputOperator<VectorType>::OutputOperator()
     :

include/deal.II/base/auto_derivative_function.h

@@ -132,7 +132,7 @@ class AutoDerivativeFunction : public Function<dim>
   /**
    * Virtual destructor; absolutely necessary in this case.
    */
-  virtual ~AutoDerivativeFunction ();
+  virtual ~AutoDerivativeFunction () = default;
 
   /**
    * Choose the difference formula. See the enum #DifferenceFormula for

include/deal.II/base/convergence_table.h

@@ -65,7 +65,7 @@ class ConvergenceTable: public TableHandler
   /**
    * Constructor.
    */
-  ConvergenceTable();
+  ConvergenceTable() = default;
 
   /**
    * Rate in relation to the rows.

include/deal.II/base/data_out_base.h

@@ -2374,7 +2374,7 @@ class DataOutInterface
    * Destructor. Does nothing, but is declared virtual since this class has
    * virtual functions.
    */
-  virtual ~DataOutInterface ();
+  virtual ~DataOutInterface () = default;
 
   /**
    * Obtain data through get_patches() and write it to <tt>out</tt> in OpenDX

include/deal.II/base/flow_function.h

@@ -56,7 +56,7 @@ namespace Functions
     /**
      * Virtual destructor.
      */
-    virtual ~FlowFunction();
+    virtual ~FlowFunction() = default;
 
     /**
      * Store an adjustment for the pressure function, such that its mean value
@@ -145,7 +145,8 @@ namespace Functions
      */
     PoisseuilleFlow<dim> (const double r,
                           const double Re);
-    virtual ~PoisseuilleFlow();
+
+    virtual ~PoisseuilleFlow() = default;
 
     virtual void vector_values (const std::vector<Point<dim> > &points,
                                 std::vector<std::vector<double> > &values) const;
@@ -187,7 +188,8 @@ namespace Functions
      * Change the viscosity and the reaction parameter.
      */
     void set_parameters (const double viscosity, const double reaction);
-    virtual ~StokesCosine();
+
+    virtual ~StokesCosine() = default;
 
     virtual void vector_values (const std::vector<Point<dim> > &points,
                                 std::vector<std::vector<double> > &values) const;
@@ -276,7 +278,8 @@ namespace Functions
      * Stokes problem.
      */
     Kovasznay (const double Re, bool Stokes = false);
-    virtual ~Kovasznay();
+
+    virtual ~Kovasznay() = default;
 
     virtual void vector_values (const std::vector<Point<2> > &points,
                                 std::vector<std::vector<double> > &values) const;

include/deal.II/base/function.h

@@ -807,7 +807,7 @@ class VectorFunctionFromTensorFunction : public Function<dim, Number>
    * This destructor is defined as virtual so as to coincide with all other
    * aspects of class.
    */
-  virtual ~VectorFunctionFromTensorFunction();
+  virtual ~VectorFunctionFromTensorFunction() = default;
 
   /**
    * Return a single component of a vector-valued function at a given point.

include/deal.II/base/function.templates.h

@@ -45,9 +45,11 @@ Function<dim, Number>::Function (const unsigned int n_components,
 }
 
 
+
+// The destructor is pure virtual so we can't default it
+// in the declaration.
 template <int dim, typename Number>
-Function<dim, Number>::~Function ()
-{}
+Function<dim, Number>::~Function () = default;
 
 
 
@@ -680,10 +682,6 @@ VectorFunctionFromTensorFunction<dim, Number>::VectorFunctionFromTensorFunction
 }
 
 
-template <int dim, typename Number>
-VectorFunctionFromTensorFunction<dim, Number>::~VectorFunctionFromTensorFunction ()
-{}
-
 
 template <int dim, typename Number>
 inline

include/deal.II/base/function_time.h

@@ -81,7 +81,7 @@ class FunctionTime
   /**
    * Virtual destructor.
    */
-  virtual ~FunctionTime();
+  virtual ~FunctionTime() = default;
 
   /**
    * Return the value of the time variable.

include/deal.II/base/function_time.templates.h

@@ -29,12 +29,6 @@ FunctionTime<Number>::FunctionTime(const Number initial_time)
 
 
 
-template <typename Number>
-FunctionTime<Number>::~FunctionTime()
-{}
-
-
-
 template <typename Number>
 void
 FunctionTime<Number>::set_time (const Number new_time)

include/deal.II/base/parallel.h

@@ -477,7 +477,7 @@ namespace parallel
      * Destructor. Made virtual to ensure that derived classes also have
      * virtual destructors.
      */
-    virtual ~ParallelForInteger ();
+    virtual ~ParallelForInteger () = default;
 
     /**
      * This function runs the for loop over the given range
@@ -843,11 +843,6 @@ namespace parallel
 #endif
 
 
-  inline
-  ParallelForInteger::~ParallelForInteger ()
-  {}
-
-
   inline
   void
   ParallelForInteger::apply_parallel (const std::size_t begin,

include/deal.II/base/parameter_handler.h

@@ -802,12 +802,12 @@ class ParameterHandler : public Subscriptor
   /**
    * Inhibit automatic CopyConstructor.
    */
-  ParameterHandler (const ParameterHandler &);
+  ParameterHandler (const ParameterHandler &) = delete;
 
   /**
    * Inhibit automatic assignment operator.
    */
-  ParameterHandler &operator= (const ParameterHandler &);
+  ParameterHandler &operator= (const ParameterHandler &) = delete;
 
 public:
   /**
@@ -863,7 +863,7 @@ class ParameterHandler : public Subscriptor
    * safer as we have virtual functions.  It actually does nothing
    * spectacular.
    */
-  virtual ~ParameterHandler ();
+  virtual ~ParameterHandler () = default;
 
   /**
    * Parse each line from a stream until the stream returns the <tt>eof</tt>
@@ -1765,7 +1765,7 @@ class MultipleParameterLoop : public ParameterHandler
      * Destructor. It doesn't actually do anything, but is declared to force
      * derived classes to have a virtual destructor.
      */
-    virtual ~UserClass ();
+    virtual ~UserClass () = default;
 
     /**
      * <tt>create_new</tt> must provide a clean object, either by creating a
@@ -1788,7 +1788,7 @@ class MultipleParameterLoop : public ParameterHandler
    * Destructor. Declare this only to have a virtual destructor, which is
    * safer as we have virtual functions. It actually does nothing spectacular.
    */
-  virtual ~MultipleParameterLoop ();
+  virtual ~MultipleParameterLoop () = default;
 
   /**
    * Read input from a stream until the stream returns the <tt>eof</tt>

include/deal.II/base/patterns.h

@@ -74,7 +74,7 @@ namespace Patterns
     /**
      * Make destructor of this and all derived classes virtual.
      */
-    virtual ~PatternBase ();
+    virtual ~PatternBase () = default;
 
     /**
      * Return <tt>true</tt> if the given string matches the pattern.
@@ -787,7 +787,7 @@ namespace Patterns
      * Constructor. (Allow for at least one non-virtual function in this
      * class, as otherwise sometimes no virtual table is emitted.)
      */
-    Anything ();
+    Anything () = default;
 
     /**
      * Return <tt>true</tt> if the string matches its constraints, i.e.
@@ -919,7 +919,7 @@ namespace Patterns
     /**
      * Constructor.
      */
-    DirectoryName ();
+    DirectoryName () = default;
 
     /**
      * Return <tt>true</tt> if the string matches its constraints, i.e.

include/deal.II/base/table.h

@@ -452,7 +452,7 @@ class TableBase : public Subscriptor
   /**
    * Destructor. Free allocated memory.
    */
-  ~TableBase ();
+  ~TableBase () = default;
 
   /**
    * Assignment operator. Copy all elements of <tt>src</tt> into the matrix.
@@ -1797,13 +1797,6 @@ namespace internal
 
 
 
-template <int N, typename T>
-inline
-TableBase<N,T>::~TableBase ()
-{}
-
-
-
 template <int N, typename T>
 inline
 TableBase<N,T> &

include/deal.II/base/table_handler.h

@@ -54,7 +54,7 @@ namespace internal
     /**
      * Default constructor.
      */
-    TableEntry ();
+    TableEntry () = default;
 
     /**
      * Constructor. Initialize this table element with the value

include/deal.II/base/tensor_function.h

@@ -75,7 +75,7 @@ class TensorFunction : public FunctionTime<Number>,
    * usually not used by their true type, but rather through pointers to this
    * base class.
    */
-  virtual ~TensorFunction ();
+  virtual ~TensorFunction () = default;
 
   /**
    * Return the value of the function at the given point.
@@ -127,7 +127,7 @@ class ConstantTensorFunction : public TensorFunction<rank, dim, Number>
   ConstantTensorFunction (const dealii::Tensor<rank, dim, Number> &value,
                           const Number initial_time = 0.0);
 
-  virtual ~ConstantTensorFunction ();
+  virtual ~ConstantTensorFunction () = default;
 
   virtual typename dealii::TensorFunction<rank, dim, Number>::value_type value (const Point<dim> &p) const;
 

include/deal.II/base/tensor_function.templates.h

@@ -33,10 +33,6 @@ TensorFunction<rank, dim, Number>::TensorFunction (const Number initial_time)
 {}
 
 
-template <int rank, int dim, typename Number>
-TensorFunction<rank, dim, Number>::~TensorFunction ()
-{}
-
 
 template <int rank, int dim, typename Number>
 typename TensorFunction<rank, dim, Number>::value_type
@@ -95,10 +91,6 @@ ConstantTensorFunction<rank, dim, Number>::ConstantTensorFunction (
 {}
 
 
-template <int rank, int dim, typename Number>
-ConstantTensorFunction<rank, dim, Number>::~ConstantTensorFunction ()
-{}
-
 
 template <int rank, int dim, typename Number>
 typename TensorFunction<rank, dim, Number>::value_type

include/deal.II/base/thread_local_storage.h

@@ -74,7 +74,7 @@ namespace Threads
      * Default constructor. Initialize each thread local object using its
      * default constructor.
      */
-    ThreadLocalStorage ();
+    ThreadLocalStorage () = default;
 
     /**
      * A kind of copy constructor. Initialize each thread local object by
@@ -179,12 +179,6 @@ namespace Threads
 
 // ----------------- inline and template functions ----------------------------
 
-  template <typename T>
-  inline
-  ThreadLocalStorage<T>::ThreadLocalStorage()
-  {}
-
-
   template <typename T>
   inline
   ThreadLocalStorage<T>::ThreadLocalStorage(const T &t)

include/deal.II/base/thread_management.h

@@ -104,7 +104,7 @@ namespace Threads
        * Destructor. Unlock the mutex. Since this is a dummy mutex class, this
        * of course does nothing.
        */
-      ~ScopedLock () {}
+      ~ScopedLock () = default;
     };
 
     /**
@@ -719,7 +719,9 @@ namespace Threads
     private:
       RT *value;
     public:
-      inline return_value () : value(nullptr) {}
+      inline return_value ()
+        : value(nullptr)
+      {}
 
       inline RT &get () const
       {