Remove extra memory_consumption methods.

The base class (introduced by the previous commit) implements the
behavior common to all of these methods.

diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h
index dfd50b4f5b52e3e649121fe1bc5ee15bd848e8ac..4db99878126067336743cba3e8a70bce85ed2e43 100644 (file)
--- a/include/deal.II/base/data_out_base.h
+++ b/include/deal.II/base/data_out_base.h
@@ -461,12 +461,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm);
-
-    /**
-     * Determine an estimate for the memory consumption (in bytes) of this
-     * object.
-     */
-    std::size_t memory_consumption () const;
   };
 
   /**
@@ -505,13 +499,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm);
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
   /**
@@ -549,13 +536,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm) const;
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
   /**
@@ -608,13 +588,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm);
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
 
@@ -853,13 +826,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm);
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
   /**
@@ -897,13 +863,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm) const;
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
   /**
@@ -1025,13 +984,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm) const;
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
 
@@ -1086,13 +1038,6 @@ namespace DataOutBase
              const unsigned int line_thickness = 1,
              const bool margin = true,
              const bool draw_colorbar = true);
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
 
@@ -1139,13 +1084,6 @@ namespace DataOutBase
      * The flags thus obtained overwrite all previous contents of this object.
      */
     void parse_parameters (const ParameterHandler &prm) const;
-
-    /**
-     * Return an estimate for the memory consumption, in bytes, of this
-     * object. This is not exact (but will usually be close) because calculating
-     * the memory usage of trees (e.g., <tt>std::map</tt>) is difficult.
-     */
-    std::size_t memory_consumption () const;
   };
 
   /**

diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index ee4bc101203a45a461ce8d6d7e63030c22216cdc..b7622f90fd81f789333feaa804018b6b6dc74255 100644 (file)
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -1907,16 +1907,6 @@ namespace DataOutBase
 
 
 
-  std::size_t
-  DataOutFilterFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
   DXFlags::DXFlags (const bool write_neighbors,
                     const bool int_binary,
                     const bool coordinates_binary,
@@ -1964,17 +1954,6 @@ namespace DataOutBase
 
 
 
-  std::size_t
-  DXFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
-
   void UcdFlags::declare_parameters (ParameterHandler &prm)
   {
     prm.declare_entry ("Write preamble", "true",
@@ -1993,16 +1972,6 @@ namespace DataOutBase
   }
 
 
-  std::size_t
-  UcdFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
   GnuplotFlags::GnuplotFlags ()
     :
     dummy (0)
@@ -2020,15 +1989,6 @@ namespace DataOutBase
 
 
 
-  size_t
-  GnuplotFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
   SvgFlags::SvgFlags (const unsigned int height_vector,
                       const int azimuth_angle,
                       const int polar_angle,
@@ -2047,16 +2007,6 @@ namespace DataOutBase
   {}
 
 
-  std::size_t
-  SvgFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
 
   void PovrayFlags::declare_parameters (ParameterHandler &prm)
   {
@@ -2085,16 +2035,6 @@ namespace DataOutBase
 
 
 
-  std::size_t
-  PovrayFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
   EpsFlags::EpsFlags (const unsigned int  height_vector,
                       const unsigned int  color_vector,
                       const SizeType      size_type,
@@ -2330,17 +2270,6 @@ namespace DataOutBase
   }
 
 
-
-  std::size_t
-  EpsFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
   GmvFlags::GmvFlags ()
   {}
 
@@ -2355,16 +2284,6 @@ namespace DataOutBase
   {}
 
 
-  std::size_t
-  GmvFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
   TecplotFlags::
   TecplotFlags (const char *tecplot_binary_file_name,
                 const char *zone_name)
@@ -2415,15 +2334,6 @@ namespace DataOutBase
 
 
 
-  std::size_t
-  VtkFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
   Deal_II_IntermediateFlags::Deal_II_IntermediateFlags ()
     :
     dummy (0)
@@ -2440,16 +2350,6 @@ namespace DataOutBase
   {}
 
 
-  std::size_t
-  Deal_II_IntermediateFlags::memory_consumption () const
-  {
-    // only simple data elements, so
-    // use sizeof operator
-    return sizeof (*this);
-  }
-
-
-
   OutputFormat
   parse_output_format (const std::string &format_name)
   {