From: bangerth Date: Sat, 5 Jan 2013 12:12:49 +0000 (+0000) Subject: Avoid deprecated types and variables. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1590e089e2a83162e7019a1a1b74a4f06a97a70e;p=dealii-svn.git Avoid deprecated types and variables. git-svn-id: https://svn.dealii.org/trunk@27932 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/dofs/dof_handler_policy.cc b/deal.II/source/dofs/dof_handler_policy.cc index 49c11f4ac1..f6bd0c8242 100644 --- a/deal.II/source/dofs/dof_handler_policy.cc +++ b/deal.II/source/dofs/dof_handler_policy.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -459,7 +459,7 @@ namespace internal static unsigned int distribute_dofs_on_level (const unsigned int offset, - const types::subdomain_id_t level_subdomain_id, + const types::subdomain_id level_subdomain_id, DoFHandler &dof_handler, const unsigned int level) { @@ -487,7 +487,7 @@ namespace internal endc = dof_handler.end(level); for (; cell != endc; ++cell) - if ((level_subdomain_id == types::invalid_subdomain_id) + if ((level_subdomain_id == numbers::invalid_subdomain_id) || (cell->level_subdomain_id() == level_subdomain_id)) next_free_dof @@ -910,7 +910,7 @@ namespace internal for (unsigned int level = 0; level < dof_handler.get_tria().n_levels(); ++level) { - unsigned int next_free_dof = Implementation::distribute_dofs_on_level(0, types::invalid_subdomain_id, dof_handler, level); + unsigned int next_free_dof = Implementation::distribute_dofs_on_level(0, numbers::invalid_subdomain_id, dof_handler, level); number_caches[level].n_global_dofs = next_free_dof; number_caches[level].n_locally_owned_dofs = next_free_dof;