Merge pull request #226 from libMesh/cast_neg_one

Avoid a signed/unsigned conversion warning
libMesh · Apr 18, 2014 · 0bd32ba · 0bd32ba
2 parents f7b570d + d757992
commit 0bd32ba
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/geom/elem.C b/src/geom/elem.C
@@ -2271,17 +2271,17 @@ void Elem::PackedElem::pack (std::vector<largest_id_type> &conn, const Elem* ele
   // use parent_ID of -1 to indicate a level 0 element
   if (elem->level() == 0)
     {
-      conn.push_back(-1);
-      conn.push_back(-1);
+      conn.push_back(static_cast<largest_id_type>(-1));
+      conn.push_back(static_cast<largest_id_type>(-1));
     }
   else
     {
       conn.push_back(elem->parent()->id());
       conn.push_back(elem->parent()->which_child_am_i(elem));
     }
 #else
-  conn.push_back (-1);
-  conn.push_back (-1);
+  conn.push_back(static_cast<largest_id_type>(-1));
+  conn.push_back(static_cast<largest_id_type>(-1));
 #endif
 
   for (unsigned int n=0; n<elem->n_nodes(); n++)
@@ -2293,7 +2293,7 @@ void Elem::PackedElem::pack (std::vector<largest_id_type> &conn, const Elem* ele
       if (neigh)
         conn.push_back (neigh->id());
       else
-        conn.push_back (-1);
+        conn.push_back(static_cast<largest_id_type>(-1));
     }
 
   elem->pack_indexing(std::back_inserter(conn));