From: kanschat Date: Wed, 10 Nov 2010 16:24:30 +0000 (+0000) Subject: fix compiler errors X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2cee6b5ef51da2dcf6219559b5250e76209bf65;p=dealii-svn.git fix compiler errors git-svn-id: https://svn.dealii.org/trunk@22682 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/fe/mapping_cartesian.cc b/deal.II/source/fe/mapping_cartesian.cc index 7a06067feb..0a5c34bc68 100644 --- a/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/source/fe/mapping_cartesian.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -372,72 +372,72 @@ fill_fe_values (const typename Triangulation::cell_iterator& cell, -template <> -void -MappingCartesian<1,1>::fill_fe_face_values ( - const typename Triangulation<1,1>::cell_iterator &, - const unsigned int, - const Quadrature<0>&, - typename Mapping<1,1>::InternalDataBase&, - std::vector >&, - std::vector&, - std::vector >&, - std::vector >&) const -{ - Assert(false, ExcNotImplemented()); -} - - -template <> -void -MappingCartesian<1,2>::fill_fe_face_values ( - const typename Triangulation<1,2>::cell_iterator &, - const unsigned int, - const Quadrature<0>&, - typename Mapping<1,2>::InternalDataBase&, - std::vector >&, - std::vector&, - std::vector >&, - std::vector >&) const -{ - Assert(false, ExcNotImplemented()); -} - - - -template <> -void -MappingCartesian<1,1>::fill_fe_subface_values ( - const typename Triangulation<1,1>::cell_iterator &, - const unsigned int, - const unsigned int, - const Quadrature<0>&, - typename Mapping<1,1>::InternalDataBase&, - std::vector >&, - std::vector&, - std::vector >&, - std::vector >&) const -{ - Assert(false, ExcNotImplemented()); -} - - - -template <> -void -MappingCartesian<1,2>::fill_fe_subface_values ( - const typename Triangulation<1,2>::cell_iterator &, - const unsigned int, - const unsigned int, - const Quadrature<0>&, - typename Mapping<1,2>::InternalDataBase&, - std::vector >&, - std::vector&, - std::vector >&, - std::vector >&) const -{ - Assert(false, ExcNotImplemented()); -} +// template <> +// void +// MappingCartesian<1,1>::fill_fe_face_values ( +// const typename Triangulation<1,1>::cell_iterator &, +// const unsigned int, +// const Quadrature<0>&, +// typename Mapping<1,1>::InternalDataBase&, +// std::vector >&, +// std::vector&, +// std::vector >&, +// std::vector >&) const +// { +// Assert(false, ExcNotImplemented()); +// } + + +// template <> +// void +// MappingCartesian<1,2>::fill_fe_face_values ( +// const typename Triangulation<1,2>::cell_iterator &, +// const unsigned int, +// const Quadrature<0>&, +// typename Mapping<1,2>::InternalDataBase&, +// std::vector >&, +// std::vector&, +// std::vector >&, +// std::vector >&) const +// { +// Assert(false, ExcNotImplemented()); +// } + + + +// template <> +// void +// MappingCartesian<1,1>::fill_fe_subface_values ( +// const typename Triangulation<1,1>::cell_iterator &, +// const unsigned int, +// const unsigned int, +// const Quadrature<0>&, +// typename Mapping<1,1>::InternalDataBase&, +// std::vector >&, +// std::vector&, +// std::vector >&, +// std::vector >&) const +// { +// Assert(false, ExcNotImplemented()); +// } + + + +// template <> +// void +// MappingCartesian<1,2>::fill_fe_subface_values ( +// const typename Triangulation<1,2>::cell_iterator &, +// const unsigned int, +// const unsigned int, +// const Quadrature<0>&, +// typename Mapping<1,2>::InternalDataBase&, +// std::vector >&, +// std::vector&, +// std::vector >&, +// std::vector >&) const +// { +// Assert(false, ExcNotImplemented()); +// } diff --git a/deal.II/source/fe/mapping_q1.cc b/deal.II/source/fe/mapping_q1.cc index 2b66511b70..9dfd082f7f 100644 --- a/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/source/fe/mapping_q1.cc @@ -886,7 +886,7 @@ MappingQ1<2,3>::compute_fill_face (const Triangulation<2,3>::cell_iterator &, template <> void MappingQ1<1,1>::compute_fill_face ( - const typename Triangulation<1,1>::cell_iterator &, + const Triangulation<1,1>::cell_iterator &, const unsigned int, const unsigned int, const unsigned int, @@ -906,7 +906,7 @@ MappingQ1<1,1>::compute_fill_face ( template <> void MappingQ1<1,2>::compute_fill_face ( - const typename Triangulation<1,2>::cell_iterator &, + const Triangulation<1,2>::cell_iterator &, const unsigned int, const unsigned int, const unsigned int, @@ -926,10 +926,10 @@ MappingQ1<1,2>::compute_fill_face ( template <> void MappingQ1<1,1>::fill_fe_face_values ( - const typename Triangulation<1,1>::cell_iterator &, + const Triangulation<1,1>::cell_iterator &, const unsigned, const Quadrature<0>&, - typename Mapping<1,1>::InternalDataBase&, + Mapping<1,1>::InternalDataBase&, std::vector >&, std::vector&, std::vector >&, @@ -943,10 +943,10 @@ MappingQ1<1,1>::fill_fe_face_values ( template <> void MappingQ1<1,2>::fill_fe_face_values ( - const typename Triangulation<1,2>::cell_iterator &, + const Triangulation<1,2>::cell_iterator &, const unsigned, const Quadrature<0>&, - typename Mapping<1,2>::InternalDataBase&, + Mapping<1,2>::InternalDataBase&, std::vector >&, std::vector&, std::vector >&, @@ -960,11 +960,11 @@ MappingQ1<1,2>::fill_fe_face_values ( template <> void MappingQ1<1,1>::fill_fe_subface_values ( - const typename Triangulation<1,1>::cell_iterator &, + const Triangulation<1,1>::cell_iterator &, const unsigned, const unsigned, const Quadrature<0>&, - typename Mapping<1,1>::InternalDataBase&, + Mapping<1,1>::InternalDataBase&, std::vector >&, std::vector&, std::vector >&, @@ -978,11 +978,11 @@ MappingQ1<1,1>::fill_fe_subface_values ( template <> void MappingQ1<1,2>::fill_fe_subface_values ( - const typename Triangulation<1,2>::cell_iterator &, + const Triangulation<1,2>::cell_iterator &, const unsigned, const unsigned, const Quadrature<0>&, - typename Mapping<1,2>::InternalDataBase&, + Mapping<1,2>::InternalDataBase&, std::vector >&, std::vector&, std::vector >&,