From: Wolfgang Bangerth Date: Tue, 13 Oct 2015 01:32:38 +0000 (-0500) Subject: Fix compilation for non-C++11 compilers. X-Git-Tag: v8.4.0-rc2~318^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff75072958dad5ab0dc7e03f9694454741a5bfc2;p=dealii.git Fix compilation for non-C++11 compilers. --- diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index c3ad4bd07d..5ebdd7d29e 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -1650,9 +1650,9 @@ next_cell: // Create a local index for the locally "owned" vertices types::global_vertex_index next_index = 0; unsigned int max_cellid_size = 0; - std::set > vertices_added; + std::set > vertices_added; std::map > vertices_to_recv; - std::map > > vertices_to_send; active_cell_iterator cell = triangulation.begin_active(), endc = triangulation.end(); @@ -1689,12 +1689,12 @@ next_cell: for (; adjacent_cell!=end_adj_cell; ++adjacent_cell) if ((*adjacent_cell)->subdomain_id()!=cell->subdomain_id()) { - std::tuple + std_cxx11::tuple tmp((*adjacent_cell)->subdomain_id(), cell->vertex_index(i)); if (vertices_added.find(tmp)==vertices_added.end()) { vertices_to_send[(*adjacent_cell)->subdomain_id()].push_back( - std::tuple (i,cell->vertex_index(i), cell->id().to_string())); if (cell->id().to_string().size() > max_cellid_size) @@ -1768,7 +1768,7 @@ next_cell: vertices_to_send.size()); std::vector first_requests(vertices_to_send.size()); typename std::map > >::iterator vert_to_send_it = vertices_to_send.begin(), vert_to_send_end = vertices_to_send.end();