From 4475e690081be6c3a3e3cf99de4a03edc5735386 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 6 Apr 2010 15:02:46 +0000 Subject: [PATCH] Use std_cxx1x::tuple instead of boost::tuple. git-svn-id: https://svn.dealii.org/trunk@20952 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/base/data_out_base.cc | 18 +++++++++--------- tests/base/data_out_base_dx.cc | 4 ++-- tests/base/data_out_base_eps.cc | 4 ++-- tests/base/data_out_base_gmv.cc | 2 +- tests/base/data_out_base_gnuplot.cc | 2 +- tests/base/data_out_base_povray.cc | 4 ++-- tests/base/data_out_base_tecplot.cc | 2 +- tests/base/data_out_base_vtk.cc | 2 +- tests/base/functions_01.cc | 2 +- tests/bits/data_out_04.cc | 8 ++++---- tests/bits/data_out_faces_04.cc | 4 ++-- tests/bits/data_out_rotation_04.cc | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/base/data_out_base.cc b/tests/base/data_out_base.cc index a5aa9f1b37..07c6deb569 100644 --- a/tests/base/data_out_base.cc +++ b/tests/base/data_out_base.cc @@ -1,8 +1,8 @@ //----------------------------------------------------------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -44,8 +44,8 @@ write_patches(const std::vector >& patches, DataOutBase::VtkFlags vtkflags; DataOutBase::Deal_II_IntermediateFlags deal_II_intermediateflags; - std::vector > vectors; - + std::vector > vectors; + WRITE(dx); if (dim==2) WRITE(eps); @@ -110,7 +110,7 @@ int PatchInfo<2>::neighbors[4][4] = {{-1, 1, 2, -1} ,{-1, -1, 3, 0} ,{ 0, 3, -1, -1} - ,{ 1, -1, -1, 2} + ,{ 1, -1, -1, 2} }; @@ -124,7 +124,7 @@ int PatchInfo<3>::neighbors[8][6] ,{-1, -1, -1, -1, -1, -1} ,{-1, -1, -1, -1, -1, -1} ,{-1, -1, -1, -1, -1, -1} - ,{-1, -1, -1, -1, -1, -1} + ,{-1, -1, -1, -1, -1, -1} }; @@ -164,7 +164,7 @@ create_patches(std::vector >& patches) { const unsigned int ncells = GeometryInfo::vertices_per_cell; const unsigned int nsub = 3; - + patches.resize(ncells); for (unsigned int c = 0; c < ncells;++c) @@ -211,10 +211,10 @@ int main() deallog.depth_console(0); deallog.threshold_double(1.e-10); -//TODO: write_eps says ExcNotImplemented +//TODO: write_eps says ExcNotImplemented // test<1,1>(logfile); test<1,2>(logfile); -//TODO: Instantiations missing (linker error) +//TODO: Instantiations missing (linker error) // test<1,3>(logfile); test<2,2>(logfile); test<2,3>(logfile); diff --git a/tests/base/data_out_base_dx.cc b/tests/base/data_out_base_dx.cc index 4565f0ed7f..b1d0a7cacc 100644 --- a/tests/base/data_out_base_dx.cc +++ b/tests/base/data_out_base_dx.cc @@ -47,7 +47,7 @@ void check(DataOutBase::DXFlags flags, names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_dx(patches, names, vectors, flags, out); } @@ -65,7 +65,7 @@ void check_cont(unsigned int ncells, std::vector names(1); names[0] = "CutOff"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_dx(patches, names, vectors, flags, out); } diff --git a/tests/base/data_out_base_eps.cc b/tests/base/data_out_base_eps.cc index dcc0d0f78d..4c91636754 100644 --- a/tests/base/data_out_base_eps.cc +++ b/tests/base/data_out_base_eps.cc @@ -46,7 +46,7 @@ void check(DataOutBase::EpsFlags flags, names[2] = "x3"; names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_eps(patches, names, vectors, flags, out); } @@ -63,7 +63,7 @@ void check_cont(unsigned int ncells, std::vector names(1); names[0] = "CutOff"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_eps(patches, names, vectors, flags, out); } diff --git a/tests/base/data_out_base_gmv.cc b/tests/base/data_out_base_gmv.cc index ef27ba7d01..3ec4409449 100644 --- a/tests/base/data_out_base_gmv.cc +++ b/tests/base/data_out_base_gmv.cc @@ -45,7 +45,7 @@ void check(DataOutBase::GmvFlags flags, names[2] = "x3"; names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_gmv(patches, names, vectors, flags, out); } diff --git a/tests/base/data_out_base_gnuplot.cc b/tests/base/data_out_base_gnuplot.cc index fff857345d..b1a2108ad0 100644 --- a/tests/base/data_out_base_gnuplot.cc +++ b/tests/base/data_out_base_gnuplot.cc @@ -44,7 +44,7 @@ void check(DataOutBase::GnuplotFlags flags, names[2] = "x3"; names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_gnuplot(patches, names, vectors, flags, out); } diff --git a/tests/base/data_out_base_povray.cc b/tests/base/data_out_base_povray.cc index 1d66a81594..687b735129 100644 --- a/tests/base/data_out_base_povray.cc +++ b/tests/base/data_out_base_povray.cc @@ -46,7 +46,7 @@ void check(DataOutBase::PovrayFlags flags, names[2] = "x3"; names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_povray(patches, names, vectors, flags, out); } @@ -63,7 +63,7 @@ void check_cont(unsigned int ncells, std::vector names(1); names[0] = "CutOff"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_povray(patches, names, vectors, flags, out); } diff --git a/tests/base/data_out_base_tecplot.cc b/tests/base/data_out_base_tecplot.cc index 818b8feee1..1412ba718e 100644 --- a/tests/base/data_out_base_tecplot.cc +++ b/tests/base/data_out_base_tecplot.cc @@ -45,7 +45,7 @@ void check(DataOutBase::TecplotFlags flags, names[2] = "x3"; names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_tecplot(patches, names, vectors, flags, out); } diff --git a/tests/base/data_out_base_vtk.cc b/tests/base/data_out_base_vtk.cc index 13d699d1df..ccd00948b9 100644 --- a/tests/base/data_out_base_vtk.cc +++ b/tests/base/data_out_base_vtk.cc @@ -45,7 +45,7 @@ void check(DataOutBase::VtkFlags flags, names[2] = "x3"; names[3] = "x4"; names[4] = "i"; - std::vector > vectors; + std::vector > vectors; DataOutBase::write_vtk(patches, names, vectors, flags, out); } diff --git a/tests/base/functions_01.cc b/tests/base/functions_01.cc index 92eacd06b8..fa18b3ab99 100644 --- a/tests/base/functions_01.cc +++ b/tests/base/functions_01.cc @@ -203,7 +203,7 @@ check_function(const Functions::FlowFunction& f, DataOutBase dout; DataOutBase::DXFlags dxflags; DataOutBase::GnuplotFlags gflags; - std::vector > vectors; + std::vector > vectors; if (dim==2) dout.write_gnuplot(patches, names, vectors, gflags, out); else diff --git a/tests/bits/data_out_04.cc b/tests/bits/data_out_04.cc index 7dedf67803..2dd75f7686 100644 --- a/tests/bits/data_out_04.cc +++ b/tests/bits/data_out_04.cc @@ -41,16 +41,16 @@ class XDataOut : public DataOut get_dataset_names () const { return DataOut::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { // if we have enough components for a // vector solution, make the last dim // components a vector - std::vector > + std::vector > retval; if (get_dataset_names().size() >= dim) - retval.push_back (boost::tuple + retval.push_back (std_cxx1x::tuple (get_dataset_names().size()-dim, get_dataset_names().size()-1, @@ -73,7 +73,7 @@ class XDataOutReader : public DataOutReader get_dataset_names () const { return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); diff --git a/tests/bits/data_out_faces_04.cc b/tests/bits/data_out_faces_04.cc index 1c319bebed..34c4037f51 100644 --- a/tests/bits/data_out_faces_04.cc +++ b/tests/bits/data_out_faces_04.cc @@ -41,7 +41,7 @@ class XDataOut : public DataOutFaces get_dataset_names () const { return DataOutFaces::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutFaces::get_vector_data_ranges (); @@ -62,7 +62,7 @@ class XDataOutReader : public DataOutReader get_dataset_names () const { return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); diff --git a/tests/bits/data_out_rotation_04.cc b/tests/bits/data_out_rotation_04.cc index a5f9c28e71..37e11c9e5b 100644 --- a/tests/bits/data_out_rotation_04.cc +++ b/tests/bits/data_out_rotation_04.cc @@ -41,7 +41,7 @@ class XDataOut : public DataOutRotation get_dataset_names () const { return DataOutRotation::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutRotation::get_vector_data_ranges (); @@ -62,7 +62,7 @@ class XDataOutReader : public DataOutReader get_dataset_names () const { return DataOutReader::get_dataset_names(); } - std::vector > + std::vector > get_vector_data_ranges () const { return DataOutReader::get_vector_data_ranges (); -- 2.39.5