From: wolf Date: Mon, 26 Feb 2001 11:02:24 +0000 (+0000) Subject: Take over fix from main branch. (tria.cc: 1.124->1.125, tria.h: 1.105->1.106) X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c33cfbe62b90a219548d974731bbd963a7fd017a;p=dealii-svn.git Take over fix from main branch. (tria.cc: 1.124->1.125, tria.h: 1.105->1.106) git-svn-id: https://svn.dealii.org/branches/Branch-3-1@4027 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h index a32a5b9ce2..8efd3bd745 100644 --- a/deal.II/deal.II/include/grid/tria.h +++ b/deal.II/deal.II/include/grid/tria.h @@ -1590,7 +1590,7 @@ class Triangulation : public TriaDimensionInfo, * default argument in * @p{set_boundary}. */ - static const StraightBoundary& straight_boundary; + static const StraightBoundary straight_boundary; public: diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index aada3a5140..9401a3884f 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -29,8 +29,8 @@ template -const StraightBoundary& Triangulation::straight_boundary -= StraightBoundary(); +const StraightBoundary Triangulation::straight_boundary; + template