From 8ab5241eac228a6b2dc94d4c35715ef206a84e69 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 11 Oct 2011 13:32:50 +0000 Subject: [PATCH] First patch post 7.1.0: Make DataOut_DoFData::merge_patches compile with new enough gcc versions. git-svn-id: https://svn.dealii.org/trunk@24593 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/news/changes.h | 5 ++++- deal.II/include/deal.II/numerics/data_out.h | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 556323c177..5fcd80ed7b 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -44,7 +44,10 @@ inconvenience this causes.

Specific improvements

    -
  1. None so far. +
  2. Fixed: The DataOut_DoFData::merge_patches did not compile with newer compilers. +This is now fixed. +
    +(Wolfgang Bangerth, 2011/10/11)
diff --git a/deal.II/include/deal.II/numerics/data_out.h b/deal.II/include/deal.II/numerics/data_out.h index 7096c108d9..7397c59529 100644 --- a/deal.II/include/deal.II/numerics/data_out.h +++ b/deal.II/include/deal.II/numerics/data_out.h @@ -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 &source, "as vectors.")); for (unsigned int i=0; i() == - 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.")); } -- 2.39.5