From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 4 Nov 2012 23:03:34 +0000 (+0000)
Subject: Partial merge from the cmake branch: Remove old and likely unused compatibility code.
X-Git-Tag: v8.0.0~1880
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ecdc61f36a424bb400780db3a8160229f6d5c7a;p=dealii.git

Partial merge from the cmake branch: Remove old and likely unused compatibility code.

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

diff --git a/deal.II/source/numerics/error_estimator.cc b/deal.II/source/numerics/error_estimator.cc
index eb1945ba84..01f9de4571 100644
--- a/deal.II/source/numerics/error_estimator.cc
+++ b/deal.II/source/numerics/error_estimator.cc
@@ -1043,7 +1043,6 @@ estimate (const DH   &dof_handler,
           const types::subdomain_id subdomain_id,
           const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution,
            error, component_mask, coefficients, n_threads, subdomain_id, material_id);
 }
@@ -1065,7 +1064,6 @@ estimate (const DH   &dof_handler,
           const types::subdomain_id subdomain_id,
           const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
            errors, component_mask, coefficients, n_threads, subdomain_id, material_id);
 }
@@ -1111,7 +1109,6 @@ estimate (const DH   &dof_handler,
           const types::subdomain_id subdomain_id,
           const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution,
            error, component_mask, coefficients, n_threads, subdomain_id, material_id);
 }
@@ -1133,7 +1130,6 @@ estimate (const DH   &dof_handler,
           const types::subdomain_id subdomain_id,
           const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<1,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
            errors, component_mask, coefficients, n_threads, subdomain_id, material_id);
 }
@@ -1459,7 +1455,6 @@ estimate (const DH                &dof_handler,
           const types::subdomain_id subdomain_id,
           const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<dim,spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution,
            error, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
@@ -1505,7 +1500,6 @@ estimate (const DH                &dof_handler,
           const types::subdomain_id subdomain_id,
           const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<dim, spacedim>::mapping, dof_handler, quadrature, neumann_bc, solution,
            error, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
@@ -1719,7 +1713,6 @@ void KellyErrorEstimator<dim, spacedim>::estimate (const DH
                                          const types::subdomain_id subdomain_id,
                                          const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<dim, spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
            errors, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
@@ -1740,7 +1733,6 @@ void KellyErrorEstimator<dim, spacedim>::estimate (const DH
                                          const types::subdomain_id subdomain_id,
                                          const types::material_id       material_id)
 {
-  Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   estimate(StaticMappingQ1<dim, spacedim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
            errors, component_mask, coefficients, n_threads,
            subdomain_id, material_id);