Use std_cxx1x::tuple instead of boost::tuple.

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

diff --git a/tests/base/data_out_base.cc b/tests/base/data_out_base.cc
index a5aa9f1b37915765d89f7f218f227a5af4c87104..07c6deb56985ed7df2c60a876a7b9511676bd83d 100644 (file)
--- 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<DataOutBase::Patch<dim,spacedim> >& patches,
   DataOutBase::VtkFlags vtkflags;
   DataOutBase::Deal_II_IntermediateFlags deal_II_intermediateflags;
 
-  std::vector<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
-  
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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<DataOutBase::Patch<dim,spacedim> >& patches)
 {
   const unsigned int ncells = GeometryInfo<dim>::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 4565f0ed7f95aebab7645481d29638339d7384c4..b1d0a7caccfb99d09c245a059cc95d4504ba40dc 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
 
   DataOutBase::write_dx(patches, names, vectors, flags, out);
 }
@@ -65,7 +65,7 @@ void check_cont(unsigned int ncells,
   
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 dcc0d0f78d8bf7a427e6189c011ee59481891244..4c9163675410899cde5d07a0cd059b18d09066d0 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_eps(patches, names, vectors, flags, out);
 }
 
@@ -63,7 +63,7 @@ void check_cont(unsigned int ncells,
   
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 ef27ba7d01d52b9c3be02103b579ce009ccff6b5..3ec44094495b1baec52708afc7f800b4d782df19 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 fff857345d950d11a18590e363aeeeba87774cce..b1a2108ad087489f074cd4deda2406052e25dd22 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 1d66a81594babfa57ec61d4015ac243826b991be..687b7351293bbb3e7da4293d59228e61cb70697f 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_povray(patches, names, vectors, flags, out);
 }
 
@@ -63,7 +63,7 @@ void check_cont(unsigned int ncells,
   
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 818b8feee1f39cc045379f0b50b55409ae3b83c6..1412ba718e0de2423b9c49aba932a22b5b1128d5 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 13d699d1df4782e2d39cc5dfc71ae1962afdfa7c..ccd00948b93812ace764f49d0c049af65b5c47a0 100644 (file)
--- 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<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/base/functions_01.cc b/tests/base/functions_01.cc
index 92eacd06b8caf71be08af497e88b9824d485182d..fa18b3ab99c983986d345b4b3de54fa8d90f16e7 100644 (file)
--- a/tests/base/functions_01.cc
+++ b/tests/base/functions_01.cc
@@ -203,7 +203,7 @@ check_function(const Functions::FlowFunction<dim>& f,
   DataOutBase dout;
   DataOutBase::DXFlags dxflags;
   DataOutBase::GnuplotFlags gflags;
-  std::vector<boost::tuple<unsigned int, unsigned int, std::string> > vectors;
+  std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > 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 7dedf678036f515d3484e0af43872380fa631934..2dd75f7686e87839af1ae90bc806064b860bc067 100644 (file)
--- a/tests/bits/data_out_04.cc
+++ b/tests/bits/data_out_04.cc
@@ -41,16 +41,16 @@ class XDataOut : public DataOut<dim>
     get_dataset_names () const    
       { return DataOut<dim>::get_dataset_names();  }
 
-    std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
     get_vector_data_ranges () const
       {
                                         // if we have enough components for a
                                         // vector solution, make the last dim
                                         // components a vector
-       std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+       std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
          retval;
        if (get_dataset_names().size() >= dim)
-         retval.push_back (boost::tuple
+         retval.push_back (std_cxx1x::tuple
                            <unsigned int, unsigned int, std::string>
                            (get_dataset_names().size()-dim,
                             get_dataset_names().size()-1,
@@ -73,7 +73,7 @@ class XDataOutReader : public DataOutReader<dim>
     get_dataset_names () const    
       { return DataOutReader<dim>::get_dataset_names();  }
 
-    std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
     get_vector_data_ranges () const
       {
        return DataOutReader<dim>::get_vector_data_ranges ();

diff --git a/tests/bits/data_out_faces_04.cc b/tests/bits/data_out_faces_04.cc
index 1c319bebedf5474152989d0f1bcdb883be467e4e..34c4037f51896f1a08a2214d925a1f44612e50a6 100644 (file)
--- a/tests/bits/data_out_faces_04.cc
+++ b/tests/bits/data_out_faces_04.cc
@@ -41,7 +41,7 @@ class XDataOut : public DataOutFaces<dim>
     get_dataset_names () const    
       { return DataOutFaces<dim>::get_dataset_names();  }
 
-    std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
     get_vector_data_ranges () const
       {
        return DataOutFaces<dim>::get_vector_data_ranges ();
@@ -62,7 +62,7 @@ class XDataOutReader : public DataOutReader<dim-1,dim>
     get_dataset_names () const    
       { return DataOutReader<dim-1,dim>::get_dataset_names();  }
 
-    std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
     get_vector_data_ranges () const
       {
        return DataOutReader<dim-1,dim>::get_vector_data_ranges ();

diff --git a/tests/bits/data_out_rotation_04.cc b/tests/bits/data_out_rotation_04.cc
index a5f9c28e71e3d9bdc65ab2d4986838d56c33ec71..37e11c9e5b0770c3eb49df8c03f87ebf09e816e6 100644 (file)
--- a/tests/bits/data_out_rotation_04.cc
+++ b/tests/bits/data_out_rotation_04.cc
@@ -41,7 +41,7 @@ class XDataOut : public DataOutRotation<dim>
     get_dataset_names () const    
       { return DataOutRotation<dim>::get_dataset_names();  }
 
-    std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
     get_vector_data_ranges () const
       {
        return DataOutRotation<dim>::get_vector_data_ranges ();
@@ -62,7 +62,7 @@ class XDataOutReader : public DataOutReader<dim+1>
     get_dataset_names () const    
       { return DataOutReader<dim+1>::get_dataset_names();  }
 
-    std::vector<boost::tuple<unsigned int, unsigned int, std::string> >
+    std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> >
     get_vector_data_ranges () const
       {
        return DataOutReader<dim+1>::get_vector_data_ranges ();