]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make one function void (instead of void*) again.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 17 Feb 2000 14:12:29 +0000 (14:12 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 17 Feb 2000 14:12:29 +0000 (14:12 +0000)
git-svn-id: https://svn.dealii.org/trunk@2428 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/numerics/error_estimator.h
deal.II/deal.II/source/numerics/error_estimator.cc

index 2449448141bc798ae8aac9fb6a45ee4001a99a1b..92d766f3e76ffb49729f5016ac4e9726c90dca76 100644 (file)
@@ -420,17 +420,18 @@ class KellyErrorEstimator
                                      * of the domain with the number n,
                                      * satisfying
                                      * #n=this_thread (mod n_threads)#
-                                     * This enumeration is choosen to
+                                     * This enumeration is chosen to
                                      * generate a random distribution
                                      * of all cells.
                                      *
-                                     * This function is only needed in
-                                     * two or three dimensions.
-                                     * The Errorestimator in one dimension
-                                     * is implemented seperatly.
+                                     * This function is only needed
+                                     * in two or three dimensions.
+                                     * The error estimator in one
+                                     * dimension is implemented
+                                     * seperatly.
                                      */
-    static void estimate_some (Data &data,
-                                const unsigned int this_thread);
+    static void estimate_some (Data &data,
+                              const unsigned int this_thread);
                                
                                     /**
                                      * Actually do the computation on a face
index 4b54144fc7e86d04c0f29af843787e4d34cb9220..8578460188a44a992c96b95760ef663eac80cd1e 100644 (file)
@@ -129,12 +129,13 @@ inline static double sqr (const double x) {
 #if deal_II_dimension == 1
 
 template <>
-void * KellyErrorEstimator<1>::estimate_some (Data &,const unsigned int )
+void KellyErrorEstimator<1>::estimate_some (Data &, const unsigned int)
 {
   Assert (false, ExcInternalError() );
-  return 0;
 }
 
+
+
 template <>
 void KellyErrorEstimator<1>::estimate (const DoFHandler<1>  &dof,
                                       const Quadrature<0>  &,
@@ -289,8 +290,8 @@ void KellyErrorEstimator<1>::estimate (const DoFHandler<1>  &dof,
 
 
 template <int dim>
-void KellyErrorEstimator<dim>::estimate_some (Data               &data,
-                                               const unsigned int  this_thread) 
+void KellyErrorEstimator<dim>::estimate_some (Data               &data,
+                                             const unsigned int  this_thread) 
 {
   
                                   // make up a fe face values object for the
@@ -399,8 +400,9 @@ void * KellyErrorEstimator<dim>::estimate_some (Data               &data,
                                       // next cell in this thread
       for (unsigned int t=0;((t<data.n_threads)&&(cell!=data.endc));++t,++cell) {};
     };
-  return 0;
-}
+};
+
+
 
 template <int dim>
 void KellyErrorEstimator<dim>::estimate (const DoFHandler<dim>   &dof,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.