[cig-commits] commit: Fix compiler warnings

[Mercurial]

changeset:   864:52452962e217
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Sep 18 12:39:06 2011 -0700
files:       plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.cxx plugins/VariableConditions/ShapeFemIC/ShapeFemIC.cxx
description:
Fix compiler warnings


diff -r 98de82980c27 -r 52452962e217 plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.cxx
--- a/plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.cxx	Fri May 13 06:13:26 2011 -0700
+++ b/plugins/ScalingChecks/Ra_Scaling/Ra_Scaling.cxx	Sun Sep 18 12:39:06 2011 -0700
@@ -64,7 +64,7 @@ void _Ra_CheckScalings_Func( void* conte
     RheologyMaterial* material;
     Rheology* rheology;
     Materials_Register*     materials_Register = self->materials_Register;
-    char* errorMesg = "";
+    char* errorMesg;
     double Ra, Ra_0, eta0, diffusivity, gravity, thermalExp=1;
     int isValid = 1; /* is this scaling check valid */
 
diff -r 98de82980c27 -r 52452962e217 plugins/VariableConditions/ShapeFemIC/ShapeFemIC.cxx
--- a/plugins/VariableConditions/ShapeFemIC/ShapeFemIC.cxx	Fri May 13 06:13:26 2011 -0700
+++ b/plugins/VariableConditions/ShapeFemIC/ShapeFemIC.cxx	Sun Sep 18 12:39:06 2011 -0700
@@ -305,9 +305,6 @@ void Underworld_GaussianIC( Node_LocalIn
 
 void _Underworld_ShapeFemIC_AssignFromXML( void* component, Stg_ComponentFactory* cf, void* data ) {
 	ConditionFunction*      condFunc;
-	UnderworldContext*      context;
-
-	context = (UnderworldContext*)Stg_ComponentFactory_ConstructByName( cf, (Name)"context", UnderworldContext, True, data  ); 
 	
 	condFunc = ConditionFunction_New( Underworld_SimpleShapeIC, (Name)"Inside1_Outside0_ShapeIC"  );
 	ConditionFunction_Register_Add( condFunc_Register, condFunc );