From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 17 Feb 2000 14:12:29 +0000 (+0000)
Subject: Make one function void (instead of void*) again.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d32237e6a94aba72deb309f36225d04d48e1506;p=dealii-svn.git

Make one function void (instead of void*) again.


git-svn-id: https://svn.dealii.org/trunk@2428 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h
index 2449448141..92d766f3e7 100644
--- a/deal.II/deal.II/include/numerics/error_estimator.h
+++ b/deal.II/deal.II/include/numerics/error_estimator.h
@@ -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
diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc
index 4b54144fc7..8578460188 100644
--- a/deal.II/deal.II/source/numerics/error_estimator.cc
+++ b/deal.II/deal.II/source/numerics/error_estimator.cc
@@ -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,