From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 2 Feb 2014 21:53:39 +0000 (+0000)
Subject: Help MS VC++ recognize which template function to take.
X-Git-Tag: v8.2.0-rc1~905
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c970414df4a008aa4d4bd4f2a1546f8e90b8a44b;p=dealii.git

Help MS VC++ recognize which template function to take.

git-svn-id: https://svn.dealii.org/trunk@32378 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/include/deal.II/numerics/vector_tools.templates.h b/deal.II/include/deal.II/numerics/vector_tools.templates.h
index 3339eaf63b..6b57aea315 100644
--- a/deal.II/include/deal.II/numerics/vector_tools.templates.h
+++ b/deal.II/include/deal.II/numerics/vector_tools.templates.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2005 - 2013 by the deal.II authors
+// Copyright (C) 2005 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1707,8 +1707,13 @@ namespace VectorTools
 
 
 
+    // template for the case dim!=1. Since the function has a template argument
+    // dim_, it is clearly less specialized than the 1d function above and
+    // whenever possible (i.e., if dim==1), the function template above
+    // will be used
     template <class DH,
-              template <int,int> class M_or_MC>
+              template <int,int> class M_or_MC,
+	      int dim_>
     static inline
     void
     do_interpolate_boundary_values (const M_or_MC<DH::dimension, DH::space_dimension> &mapping,
@@ -1716,7 +1721,7 @@ namespace VectorTools
                                     const typename FunctionMap<DH::space_dimension>::type &function_map,
                                     std::map<types::global_dof_index,double> &boundary_values,
                                     const ComponentMask       &component_mask,
-                                    const dealii::internal::int2type<DH::dimension>)
+                                    const dealii::internal::int2type<dim_>)
     {
       const unsigned int dim = DH::dimension;
       const unsigned int spacedim=DH::space_dimension;