]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
First patch post 7.1.0: Make DataOut_DoFData::merge_patches compile with new enough...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 11 Oct 2011 13:32:50 +0000 (13:32 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 11 Oct 2011 13:32:50 +0000 (13:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@24593 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/news/changes.h
deal.II/include/deal.II/numerics/data_out.h

index 556323c17708e2e8e5c6b827dd79fc001de548f5..5fcd80ed7bc2d7416a27d5cebdc66a6070491790 100644 (file)
@@ -44,7 +44,10 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
-<li> None so far.
+<li> Fixed: The DataOut_DoFData::merge_patches did not compile with newer compilers.
+This is now fixed.
+<br>
+(Wolfgang Bangerth, 2011/10/11)
 </ol>
 
 
index 7096c108d933994936ca3d844ed488e264abfbee..7397c59529d5dee378078b46559198d595c79137 100644 (file)
@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors
+//    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -1476,16 +1476,16 @@ merge_patches (const DataOut_DoFData<DH2,patch_dim,patch_space_dim> &source,
                      "as vectors."));
   for (unsigned int i=0; i<get_vector_data_ranges().size(); ++i)
     {
-      Assert (get_vector_data_ranges()[i].template get<0>() ==
-             source.get_vector_data_ranges()[i].template get<0>(),
+      Assert (std_cxx1x::get<0>(get_vector_data_ranges()[i]) ==
+             std_cxx1x::get<0>(source.get_vector_data_ranges()[i]),
              ExcMessage ("Both sources need to declare the same components "
                          "as vectors."));
-      Assert (get_vector_data_ranges()[i].template get<1>() ==
-             source.get_vector_data_ranges()[i].template get<1>(),
+      Assert (std_cxx1x::get<1>(get_vector_data_ranges()[i]) ==
+             std_cxx1x::get<1>(source.get_vector_data_ranges()[i]),
              ExcMessage ("Both sources need to declare the same components "
                          "as vectors."));
-      Assert (get_vector_data_ranges()[i].template get<2>() ==
-             source.get_vector_data_ranges()[i].template get<2>(),
+      Assert (std_cxx1x::get<2>(get_vector_data_ranges()[i]) ==
+             std_cxx1x::get<2>(source.get_vector_data_ranges()[i]),
              ExcMessage ("Both sources need to declare the same components "
                          "as vectors."));
     }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.