]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Make sure the two arguments to make_pair have the same type (Sun CC complains about...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 13 Mar 2005 06:17:55 +0000 (06:17 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 13 Mar 2005 06:17:55 +0000 (06:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@10117 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/fe/fe_raviart_thomas.cc

index 70001af097ea89fc211b451d971532df42639376..26cdcd600b8c9af10fe01a025c978e81954dabc0 100644 (file)
@@ -1307,19 +1307,19 @@ FE_RaviartThomas<2>::compute_renumber (const unsigned int degree)
 
                                    // face 0
   for (unsigned int i=0; i<degree+1; ++i)
-    ret_val.push_back (std::make_pair (1, i));
+    ret_val.push_back (std::make_pair (1U, i));
   
                                    // face 1
   for (unsigned int i=0; i<degree+1; ++i)
-    ret_val.push_back (std::make_pair (0, (degree+2)*i+1));
+    ret_val.push_back (std::make_pair (0U, (degree+2)*i+1));
   
                                    // face 2
   for (unsigned int i=0; i<degree+1; ++i)
-    ret_val.push_back (std::make_pair (1, (degree+1)+i));
+    ret_val.push_back (std::make_pair (1U, (degree+1)+i));
   
                                    // face 3
   for (unsigned int i=0; i<degree+1; ++i)
-    ret_val.push_back (std::make_pair (0, (degree+2)*i));
+    ret_val.push_back (std::make_pair (0U, (degree+2)*i));
 
                                    // then go on with interior bubble
                                    // functions, first for the
@@ -1331,7 +1331,7 @@ FE_RaviartThomas<2>::compute_renumber (const unsigned int degree)
         const unsigned int index_in_component = (x+2) + y*(degree+2);
         Assert (index_in_component < (degree+1)*(degree+2),
                 ExcInternalError());
-        ret_val.push_back (std::make_pair(0, index_in_component));
+        ret_val.push_back (std::make_pair(0U, index_in_component));
       }
   for (unsigned int x=0; x<degree+1; ++x)
     for (unsigned int y=0; y<degree; ++y)
@@ -1339,7 +1339,7 @@ FE_RaviartThomas<2>::compute_renumber (const unsigned int degree)
         const unsigned int index_in_component = 2*(degree+1) + y + x*degree;
         Assert (index_in_component < (degree+1)*(degree+2),
                 ExcInternalError());
-        ret_val.push_back (std::make_pair(1, index_in_component));
+        ret_val.push_back (std::make_pair(1U, index_in_component));
       }
 
 #ifdef DEBUG  

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.