From: Wolfgang Bangerth Date: Tue, 5 May 1998 11:31:05 +0000 (+0000) Subject: Cleanup map<...> declarations. X-Git-Tag: v8.0.0~23004 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a748ac98f03cd5422dc662e477bc38aff84a52f;p=dealii.git Cleanup map<...> declarations. git-svn-id: https://svn.dealii.org/trunk@250 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index 5358032808..1601f50efb 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -111,7 +111,7 @@ void ParameterHandler::clear () { changed_entries.entries.erase (changed_entries.entries.begin(), changed_entries.entries.end()); - map >::iterator p; + map::iterator p; for (p=defaults.subsections.begin(); p!=defaults.subsections.end(); ++p) delete p->second; @@ -212,7 +212,7 @@ const String & ParameterHandler::get (const String &entry_string) const { // entry exists; now find out whether // it was changed: - map, less >::const_iterator ptr; + map >::const_iterator ptr; ptr = pc->entries.find (entry_string); if (ptr != pc->entries.end()) return ptr->second.first; @@ -302,7 +302,7 @@ void ParameterHandler::print_parameters_section (ostream &out, Section *pc = get_present_changed_subsection (); // traverse entry list - map, less >::const_iterator ptr; + map >::const_iterator ptr; // first find out the longest entry name unsigned int longest_entry = 0; @@ -361,7 +361,7 @@ void ParameterHandler::print_parameters_section (ostream &out, // now transverse subsections tree - map >::const_iterator ptrss; + map::const_iterator ptrss; for (ptrss = pd->subsections.begin(); ptrss != pd->subsections.end(); ++ptrss) { switch (style) @@ -600,7 +600,7 @@ const ParameterHandler::Section* ParameterHandler::get_present_changed_subsectio ParameterHandler::Section::~Section () { entries.erase (entries.begin(), entries.end()); - map >::iterator p; + map::iterator p; for (p=subsections.begin(); p!=subsections.end(); ++p) delete p->second; @@ -726,7 +726,7 @@ void MultipleParameterLoop::init_branches () { void MultipleParameterLoop::init_branches_section (const ParameterHandler::Section &sec) { // check all entries in the present subsection // whether it is a multiple entry - map, less >::const_iterator e; + map >::const_iterator e; for (e = sec.entries.begin(); e != sec.entries.end(); ++e) if (e->second.first.contains('{')) multiple_choices.push_back (Entry(subsection_path, @@ -735,7 +735,7 @@ void MultipleParameterLoop::init_branches_section (const ParameterHandler::Secti // transverse subsections - map >::const_iterator s; + map::const_iterator s; for (s = sec.subsections.begin(); s != sec.subsections.end(); ++s) { enter_subsection (s->first); diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index 2e9e446576..3fa5fda2a7 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -880,7 +880,7 @@ void DoFHandler::renumber_dofs (const RenumberingMethod method, // store for each coordination // number the dofs with these // coordination number - multimap > dofs_by_coordination; + multimap dofs_by_coordination; // find coordination number for // each of these dofs @@ -902,7 +902,7 @@ void DoFHandler::renumber_dofs (const RenumberingMethod method, }; //// - multimap >::iterator i; + multimap::iterator i; for (i = dofs_by_coordination.begin(); i!=dofs_by_coordination.end(); ++i) new_number[i->second] = next_free_number++; diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index f1242121c3..acc8ae2a49 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -167,7 +167,7 @@ void Triangulation<2>::create_triangulation (const vector > &v, // object itself. In the first run, these // iterators are all invalid ones, but they // are filled afterwards - map,line_iterator,less > > needed_lines; + map,line_iterator> needed_lines; for (unsigned int cell=0; cell::create_triangulation (const vector > &v, if (true) { vector vertex_touch_count (v.size(), 0); - map,line_iterator,less > >::iterator i; + map,line_iterator>::iterator i; for (i=needed_lines.begin(); i!=needed_lines.end(); i++) { // touch the vertices of this line @@ -288,7 +288,7 @@ void Triangulation<2>::create_triangulation (const vector > &v, if (true) { raw_line_iterator line = begin_raw_line(); - map,line_iterator,less > >::iterator i; + map,line_iterator>::iterator i; for (i = needed_lines.begin(); line!=end_line(); ++line, ++i) { line->set (Line(i->first.first, i->first.second)); @@ -300,7 +300,7 @@ void Triangulation<2>::create_triangulation (const vector > &v, // store for each line index // the adjacent cells - map,less > adjacent_cells; + map > adjacent_cells; // finally make up cells if (true) diff --git a/deal.II/deal.II/source/numerics/data_io.cc b/deal.II/deal.II/source/numerics/data_io.cc index 745abddca2..c5194bb06d 100644 --- a/deal.II/deal.II/source/numerics/data_io.cc +++ b/deal.II/deal.II/source/numerics/data_io.cc @@ -80,7 +80,7 @@ void DataIn::read_ucd (istream &in) { // set up mapping between numbering // in ucd-file (key) and in the // vertices vector - map > vertex_indices; + map vertex_indices; for (unsigned int vertex=0; vertex