[cig-commits] [commit] master: Attempt to shut up clang (e829721)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde...dbe66e1b6d25d5ff21653c48f14f343e10ae69f4

>---------------------------------------------------------------

commit e8297211d03fac4a6bf793bc861f7af93aee83fd
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon May 19 15:08:11 2014 -0500

    Attempt to shut up clang


>---------------------------------------------------------------

e8297211d03fac4a6bf793bc861f7af93aee83fd
 source/material_model/multicomponent.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/material_model/multicomponent.cc b/source/material_model/multicomponent.cc
index 6536402..7d0cdb7 100644
--- a/source/material_model/multicomponent.cc
+++ b/source/material_model/multicomponent.cc
@@ -401,7 +401,7 @@ namespace aspect
 
           //Parse densities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Densities")));
-          AssertThrow(x_values.size() == 1 || (x_values.size() == n_fields), 
+          AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
                       ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             densities.assign( n_fields , x_values[0]);
@@ -410,7 +410,7 @@ namespace aspect
 
           //Parse viscosities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Viscosities")));
-          AssertThrow(x_values.size() == 1 || (x_values.size() == n_fields), 
+          AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
                       ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             viscosities.assign( n_fields , x_values[0]);
@@ -419,7 +419,7 @@ namespace aspect
 
           //Parse thermal conductivities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Thermal conductivities")));
-          AssertThrow(x_values.size() == 1 || (x_values.size() == n_fields), 
+          AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
                       ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             thermal_conductivities.assign( n_fields , x_values[0]);
@@ -428,7 +428,7 @@ namespace aspect
  
           //Parse thermal expansivities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Thermal expansivities")));
-          AssertThrow(x_values.size() == 1 || (x_values.size() == n_fields), 
+          AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
                       ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             thermal_expansivities.assign( n_fields , x_values[0]);
@@ -437,7 +437,7 @@ namespace aspect
 
           //Parse specific heats
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Specific heats")));
-          AssertThrow(x_values.size() == 1 || (x_values.size() == n_fields), 
+          AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
                       ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             specific_heats.assign( n_fields , x_values[0]);