From: Guido Kanschat Date: Thu, 26 Jan 2006 11:52:29 +0000 (+0000) Subject: inline operators and make function static X-Git-Tag: v8.0.0~12493 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a178106d72cd3161b2472b5142e958be87e17ca7;p=dealii.git inline operators and make function static git-svn-id: https://svn.dealii.org/trunk@12182 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 50591fda45..7adef23e6b 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1495,9 +1495,10 @@ class DoFTools * length inside this function. */ template - void convert_couplings_to_blocks (const hp::DoFHandler& dof_handler, - const Table<2, Coupling>& table_by_component, - std::vector >& tables_by_block); + static void + convert_couplings_to_blocks (const hp::DoFHandler& dof_handler, + const Table<2, Coupling>& table_by_component, + std::vector >& tables_by_block); /** * Map a coupling table from the * user friendly organization by @@ -1514,9 +1515,10 @@ class DoFTools * length inside this function. */ template - void convert_couplings_to_blocks (const DoFHandler& dof_handler, - const Table<2, Coupling>& table_by_component, - std::vector >& tables_by_block); + static void + convert_couplings_to_blocks (const DoFHandler& dof_handler, + const Table<2, Coupling>& table_by_component, + std::vector >& tables_by_block); /** * Exception @@ -1638,6 +1640,7 @@ class DoFTools * * @relates DoFTools */ +inline DoFTools::Coupling operator |= (DoFTools::Coupling& c1, const DoFTools::Coupling c2) { @@ -1654,6 +1657,7 @@ DoFTools::Coupling operator |= (DoFTools::Coupling& c1, * * @relates DoFTools */ +inline DoFTools::Coupling operator | (const DoFTools::Coupling c1, const DoFTools::Coupling c2) {