From fa7b54f131c6af94483012ab1afb7c1d31d83fb6 Mon Sep 17 00:00:00 2001
From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sat, 24 Jul 2010 00:25:00 +0000
Subject: [PATCH] Take over r21566 from mainline.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21567 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/deal.II/source/fe/fe_values.inst.in | 6 +++---
 deal.II/doc/news/changes.h                  | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/deal.II/deal.II/source/fe/fe_values.inst.in b/deal.II/deal.II/source/fe/fe_values.inst.in
index b3175fe419..ca6dfc5e1a 100644
--- a/deal.II/deal.II/source/fe/fe_values.inst.in
+++ b/deal.II/deal.II/source/fe/fe_values.inst.in
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 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
@@ -100,11 +100,11 @@ for (VEC : SERIAL_VECTORS)
 	(const dealii::VEC&, std::vector<Tensor<1,deal_II_dimension+1> >&) const;
 
     template
-	void FEValuesViews::SymmetricTensor<2,deal_II_dimension+1>
+	void FEValuesViews::SymmetricTensor<2, deal_II_dimension, deal_II_dimension+1>
         ::get_function_values<dealii::VEC>
 	(const dealii::VEC&, std::vector<dealii::SymmetricTensor<2,deal_II_dimension+1> >&) const;
     template
-	void FEValuesViews::SymmetricTensor<2,deal_II_dimension+1>
+	void FEValuesViews::SymmetricTensor<2, deal_II_dimension, deal_II_dimension+1>
         ::get_function_divergences<dealii::VEC>
 	(const dealii::VEC&, std::vector<Tensor<1,deal_II_dimension+1> >&) const;
 
diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 9dcddefa92..52d2add659 100644
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -38,6 +38,14 @@ inconvenience this causes.
 <h3>General</h3>
 
 <ol>
+  <li>
+  <p>Fixed: When using Trilinos and deal.II both with static libraries,
+  a linker error would occur whenever a program linked both the 2d and
+  3d libraries of deal.II. This is now fixed.
+  <br>
+  (WB 2010/07/23)
+  </p>
+
   <li>
   <p>Fixed: On all non-linux platforms, if static libraries were selected
   and <code>./configure</code> was instructed to use Trilinos (which also
-- 
2.39.5