Merged from trunk r32200 through r32214.

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32215 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in
index c0a1eda16ba632e5c5200118d41d884ad2ccd54f..757cf70c39c870f70467ead9be3ecb6843de9385 100644 (file)
--- a/deal.II/include/deal.II/base/config.h.in
+++ b/deal.II/include/deal.II/base/config.h.in
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2012 - 2013 by the deal.II authors
+// Copyright (C) 2012 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -187,6 +187,10 @@
 #  pragma warning( disable : 4700 ) /* uninitialized local variable */
 #  pragma warning( disable : 4789 ) /* destination of memory copy is too small */
 #  pragma warning( disable : 4808 ) /* case 'value' is not a valid value for switch condition of type 'bool */
+
+/* Also make sure we don't let MS Windows headers define min/max as
+   macros, see http://support.microsoft.com/kb/143208 */
+#  define NOMINMAX
 #endif /*_MSC_VER*/
 
 

diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h
index e3dc97f94b54c3801994e039de04000c0d89a133..327146e3f59630a48c1d3ce60fa7a78946fd8c7a 100644 (file)
--- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h
+++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -77,7 +77,8 @@ template <int structdim, class DH, bool lda>
 template <int dim2, class DH2, bool lda2>
 inline
 DoFAccessor<structdim,DH,lda>::DoFAccessor (const DoFAccessor<dim2, DH2, lda2> &other)
-  : BaseClass(other), dof_handler(const_cast<DH *>(other.dof_handler))
+  : BaseClass(other),
+    dof_handler(0)
 {
   Assert (false, ExcInvalidObject());
 }
@@ -88,7 +89,8 @@ template <int structdim, class DH, bool lda>
 template <bool lda2>
 inline
 DoFAccessor<structdim,DH,lda>::DoFAccessor (const DoFAccessor<structdim, DH, lda2> &other)
-  : BaseClass(other), dof_handler(const_cast<DH *>(other.dof_handler))
+  : BaseClass(other),
+    dof_handler(const_cast<DH *>(other.dof_handler))
 {
 }
 

diff --git a/deal.II/include/deal.II/grid/grid_tools.h b/deal.II/include/deal.II/grid/grid_tools.h
index b65081d4a516acd9b1cc1b2d372ca965da95cffc..5f43b3af9e00307c8f2a0deee058f57f8fb17110 100644 (file)
--- a/deal.II/include/deal.II/grid/grid_tools.h
+++ b/deal.II/include/deal.II/grid/grid_tools.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2001 - 2013 by the deal.II authors
+// Copyright (C) 2001 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1236,11 +1236,11 @@ namespace GridTools
 
 
 
-  template <class DH>
-  std::vector<typename DH::active_cell_iterator>
-  get_active_child_cells (const typename DH::cell_iterator &cell)
+  template <class Container>
+  std::vector<typename Container::active_cell_iterator>
+  get_active_child_cells (const typename Container::cell_iterator &cell)
   {
-    std::vector<typename DH::active_cell_iterator> child_cells;
+    std::vector<typename Container::active_cell_iterator> child_cells;
 
     if (cell->has_children())
       {
@@ -1248,8 +1248,8 @@ namespace GridTools
              child<cell->n_children(); ++child)
           if (cell->child (child)->has_children())
             {
-              const std::vector<typename DH::active_cell_iterator>
-              children = get_active_child_cells<DH> (cell->child(child));
+              const std::vector<typename Container::active_cell_iterator>
+              children = get_active_child_cells<Container> (cell->child(child));
               child_cells.insert (child_cells.end(),
                                   children.begin(), children.end());
             }

diff --git a/deal.II/include/deal.II/lac/vector.h b/deal.II/include/deal.II/lac/vector.h
index 8dae825247d238d7c97a6408a8d82ba305bfad88..ceea283c5d56cd649ec28b3520e72225e00dec28 100644 (file)
--- a/deal.II/include/deal.II/lac/vector.h
+++ b/deal.II/include/deal.II/lac/vector.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1233,7 +1233,7 @@ inline
 Vector<Number> &
 Vector<Number>::operator = (const Vector<Number> &v)
 {
-  internal::Vector::copy_vector (v, *this);
+  dealii::internal::Vector::copy_vector (v, *this);
   return *this;
 }
 

diff --git a/deal.II/source/grid/grid_out.cc b/deal.II/source/grid/grid_out.cc
index edf857458e9ac0bfc08267c43846a5edf7500e09..f0dd256b68b20ede68901b7bb8f7d795497e10e3 100644 (file)
--- a/deal.II/source/grid/grid_out.cc
+++ b/deal.II/source/grid/grid_out.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1530,7 +1530,7 @@ void GridOut::write_svg(const Triangulation<2,2> &tria, std::ostream &out) const
   Point<3> camera_direction_temp;
   Point<3> camera_horizontal_temp;
 
-  const float angle_factor = 3.14159265 / 180.;
+  const double angle_factor = 3.14159265 / 180.;
 
   // (I) rotate the camera to the chosen polar angle
   camera_position_temp[1] = cos(angle_factor * svg_flags.polar_angle) * camera_position[1] - sin(angle_factor * svg_flags.polar_angle) * camera_position[2];

diff --git a/deal.II/source/grid/tria_accessor.cc b/deal.II/source/grid/tria_accessor.cc
index e979820df3205210fdc852f636fa28c45616d470..3db487f43f4e63afcdd3bc01a6236b5abf8bd1b4 100644 (file)
--- a/deal.II/source/grid/tria_accessor.cc
+++ b/deal.II/source/grid/tria_accessor.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1998 - 2013 by the deal.II authors
+// Copyright (C) 1998 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1249,7 +1249,7 @@ bool CellAccessor<3>::point_inside (const Point<3> &p) const
       return (GeometryInfo<dim>::is_inside_unit_cell
               (StaticMappingQ1<dim,spacedim>::mapping.transform_real_to_unit_cell(cell_iterator, p)));
     }
-  catch (const Mapping<dim,spacedim>::ExcTransformationFailed &e)
+  catch (const Mapping<dim,spacedim>::ExcTransformationFailed &)
     {
       return false;
     }

diff --git a/deal.II/source/numerics/vector_tools_interpolate.inst.in b/deal.II/source/numerics/vector_tools_interpolate.inst.in
index 988939367714de023267dedc809b7acf784ddd86..a21c69a76b34f5339a41d07a1fec4cbdb2fb52ac 100644 (file)
--- a/deal.II/source/numerics/vector_tools_interpolate.inst.in
+++ b/deal.II/source/numerics/vector_tools_interpolate.inst.in
@@ -32,6 +32,15 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         (const DoFHandler<deal_II_dimension,deal_II_space_dimension>&,
          const Function<deal_II_space_dimension>&,
          VEC&);
+
+      template
+        void interpolate
+        (const DoFHandler<deal_II_dimension,deal_II_space_dimension>&,
+         const DoFHandler<deal_II_dimension,deal_II_space_dimension>&,
+         const FullMatrix<double>&,
+         const VEC&,
+         VEC&);
+
       \}
 #endif
   }
@@ -57,14 +66,6 @@ for (VEC : SERIAL_VECTORS ; deal_II_dimension : DIMENSIONS; deal_II_space_dimens
         (const hp::DoFHandler<deal_II_dimension>&,
          const Function<deal_II_dimension>&,
          VEC&);
-
-      template
-        void interpolate
-        (const DoFHandler<deal_II_dimension>&,
-         const DoFHandler<deal_II_dimension>&,
-         const FullMatrix<double>&,
-         const VEC&,
-         VEC&);
          
      template
       void interpolate_based_on_material_id(const Mapping<deal_II_dimension, deal_II_space_dimension>&,