]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Cleanup map<...> declarations.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 5 May 1998 11:31:05 +0000 (11:31 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 5 May 1998 11:31:05 +0000 (11:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@250 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/source/parameter_handler.cc
deal.II/deal.II/source/dofs/dof_handler.cc
deal.II/deal.II/source/grid/tria.cc
deal.II/deal.II/source/numerics/data_io.cc

index 5358032808b4a92fd5548057aadf9549e9826211..1601f50efbf4cfa7154ee465ddd8b4eb69ce1820 100644 (file)
@@ -111,7 +111,7 @@ void ParameterHandler::clear () {
   changed_entries.entries.erase (changed_entries.entries.begin(),
                                 changed_entries.entries.end());
 
-  map<String, Section*, less<String> >::iterator p;
+  map<String, Section*>::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<String, pair<String,String>, less<String> >::const_iterator ptr;
+  map<String, pair<String,String> >::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<String, pair<String,String>, less<String> >::const_iterator ptr;
+  map<String, pair<String,String> >::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<String, Section*, less<String> >::const_iterator ptrss;
+  map<String, Section*>::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<String, Section*, less<String> >::iterator p;
+  map<String, Section*>::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<String, pair<String,String>, less<String> >::const_iterator e;
+  map<String, pair<String,String> >::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<String, Section*, less<String> >::const_iterator s;
+  map<String, Section*>::const_iterator s;
   for (s = sec.subsections.begin(); s != sec.subsections.end(); ++s) 
     {
       enter_subsection (s->first);
index 2e9e44657640fc3c5fdd5ccc963aac11f530e9fc..3fa5fda2a755ddd113a2dafb0c2540f93f4ace04 100644 (file)
@@ -880,7 +880,7 @@ void DoFHandler<dim>::renumber_dofs (const RenumberingMethod method,
                                       // store for each coordination
                                       // number the dofs with these
                                       // coordination number
-      multimap<unsigned int, int, less<unsigned int> > dofs_by_coordination;
+      multimap<unsigned int, int> dofs_by_coordination;
       
                                       // find coordination number for
                                       // each of these dofs
@@ -902,7 +902,7 @@ void DoFHandler<dim>::renumber_dofs (const RenumberingMethod method,
        };
       
                                       ////
-      multimap<unsigned int, int, less<unsigned int> >::iterator i;
+      multimap<unsigned int, int>::iterator i;
       for (i = dofs_by_coordination.begin(); i!=dofs_by_coordination.end(); ++i) 
        new_number[i->second] = next_free_number++;
 
index f1242121c3ec637533f47f911c12674ecffe7e80..acc8ae2a49ac2036ff453245e31a94b601ee26ce 100644 (file)
@@ -167,7 +167,7 @@ void Triangulation<2>::create_triangulation (const vector<Point<2> >    &v,
                                   // object itself. In the first run, these
                                   // iterators are all invalid ones, but they
                                   // are filled afterwards
-  map<pair<int,int>,line_iterator,less<pair<int,int> > > needed_lines;
+  map<pair<int,int>,line_iterator> needed_lines;
   for (unsigned int cell=0; cell<cells.size(); ++cell)
     {
 #ifdef DEBUG
@@ -263,7 +263,7 @@ void Triangulation<2>::create_triangulation (const vector<Point<2> >    &v,
   if (true) 
     {
       vector<unsigned short int> vertex_touch_count (v.size(), 0);
-      map<pair<int,int>,line_iterator,less<pair<int,int> > >::iterator i;
+      map<pair<int,int>,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<Point<2> >    &v,
   if (true) 
     {
       raw_line_iterator line = begin_raw_line();
-      map<pair<int,int>,line_iterator,less<pair<int,int> > >::iterator i;
+      map<pair<int,int>,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<Point<2> >    &v,
 
                                   // store for each line index
                                   // the adjacent cells
-  map<int,vector<cell_iterator>,less<int> > adjacent_cells;
+  map<int,vector<cell_iterator> > adjacent_cells;
 
                                   // finally make up cells
   if (true) 
index 745abddca2ecd57937ad19b21f4149f6162c2cd8..c5194bb06d8970403c07e49899934b24ed952117 100644 (file)
@@ -80,7 +80,7 @@ void DataIn<dim>::read_ucd (istream &in) {
                                   // set up mapping between numbering
                                   // in ucd-file (key) and in the
                                   // vertices vector
-  map<int,int,less<int> > vertex_indices;
+  map<int,int> vertex_indices;
   
   for (unsigned int vertex=0; vertex<n_vertices; ++vertex) 
     {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.