[cig-commits] commit: Fix compiler warnings

[Mercurial]

changeset:   809:23b1fcc4c8b9
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Oct 16 04:59:37 2011 -0700
files:       Base/Context/src/SetVC.cxx Base/Context/src/SetVC.h Base/Context/src/VariableAllVC.cxx Base/Context/src/VariableAllVC.h Base/Extensibility/src/Module.cxx Base/Extensibility/src/ModulesManager.cxx pcu/src/pcuassert.cxx pcu/src/pcuassert.h
description:
Fix compiler warnings


diff -r 0e60363584a7 -r 23b1fcc4c8b9 Base/Context/src/SetVC.cxx
--- a/Base/Context/src/SetVC.cxx	Fri Oct 07 23:37:14 2011 -0700
+++ b/Base/Context/src/SetVC.cxx	Sun Oct 16 04:59:37 2011 -0700
@@ -68,7 +68,7 @@ SetVC* SetVC_New(
 SetVC* SetVC_New(
 	Name									name,
 	AbstractContext*					context,
-	char*									_dictionaryEntryName, 
+	const char*						_dictionaryEntryName, 
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
 	Dictionary*							dictionary )
diff -r 0e60363584a7 -r 23b1fcc4c8b9 Base/Context/src/SetVC.h
--- a/Base/Context/src/SetVC.h	Fri Oct 07 23:37:14 2011 -0700
+++ b/Base/Context/src/SetVC.h	Sun Oct 16 04:59:37 2011 -0700
@@ -73,7 +73,7 @@
 	SetVC* SetVC_New(
 		Name									name,
 		AbstractContext*					context,
-		char*									_dictionaryEntryName, 
+		const char*									_dictionaryEntryName, 
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
 		Dictionary*							dictionary );
diff -r 0e60363584a7 -r 23b1fcc4c8b9 Base/Context/src/VariableAllVC.cxx
--- a/Base/Context/src/VariableAllVC.cxx	Fri Oct 07 23:37:14 2011 -0700
+++ b/Base/Context/src/VariableAllVC.cxx	Sun Oct 16 04:59:37 2011 -0700
@@ -69,7 +69,7 @@ VariableAllVC*	VariableAllVC_New(
 VariableAllVC*	VariableAllVC_New(
 	Name									name,
 	AbstractContext*					context,
-	char*									_dictionaryEntryName, 
+	const char*									_dictionaryEntryName, 
 	Variable_Register*				variable_Register, 
 	ConditionFunction_Register*	conFunc_Register,
 	Dictionary*							dictionary,
diff -r 0e60363584a7 -r 23b1fcc4c8b9 Base/Context/src/VariableAllVC.h
--- a/Base/Context/src/VariableAllVC.h	Fri Oct 07 23:37:14 2011 -0700
+++ b/Base/Context/src/VariableAllVC.h	Sun Oct 16 04:59:37 2011 -0700
@@ -78,7 +78,7 @@
 	VariableAllVC* VariableAllVC_New(
 		Name									name,
 		AbstractContext*					context,
-		char*									_dictionaryEntryName, 
+		const char*									_dictionaryEntryName, 
 		Variable_Register*				variable_Register, 
 		ConditionFunction_Register*	conFunc_Register,
 		Dictionary*							dictionary,
diff -r 0e60363584a7 -r 23b1fcc4c8b9 Base/Extensibility/src/Module.cxx
--- a/Base/Extensibility/src/Module.cxx	Fri Oct 07 23:37:14 2011 -0700
+++ b/Base/Extensibility/src/Module.cxx	Sun Oct 16 04:59:37 2011 -0700
@@ -114,20 +114,16 @@ void _Module_Init(
 	char*                           fileName = NULL;
 	char*                           fullPathName = NULL;
 
-	Stream*                         stream;
-	Stream*                         debug;
-	Stream*                         error;
-
 #ifndef NOSHARED
 	int                             fullPathLength = 0;
 	int                             length;
 	Index                           dir_i;
+	
+	Stream *stream =  Journal_Register( Info_Type, self->type );
+	Stream *error =  Journal_Register( Error_Type, self->type );
 #endif
 	
-	stream =  Journal_Register( Info_Type, self->type );
-	debug =  Journal_Register( Debug_Type, self->type );
-	error =  Journal_Register( Error_Type, self->type );
-	
+	Stream *debug =  Journal_Register( Debug_Type, self->type );
 	self->MangleName = MangleName;
 	
 	
diff -r 0e60363584a7 -r 23b1fcc4c8b9 Base/Extensibility/src/ModulesManager.cxx
--- a/Base/Extensibility/src/ModulesManager.cxx	Fri Oct 07 23:37:14 2011 -0700
+++ b/Base/Extensibility/src/ModulesManager.cxx	Sun Oct 16 04:59:37 2011 -0700
@@ -306,12 +306,9 @@ Bool ModulesManager_LoadModule( void* mo
 	
 	Stream* stream;
 	Stream* debug;
-	Stream* error;
-
     
 	stream =  Journal_Register( Info_Type, self->type );
 	debug =  Journal_Register( Debug_Type, self->type );
-	error =  Journal_Register( Error_Type, self->type );
 
 	if ( Stg_ObjectList_Get( self->modules, moduleName ) != NULL ) {
 		Journal_Printf( debug, "Module %s already loaded\n", moduleName );
diff -r 0e60363584a7 -r 23b1fcc4c8b9 pcu/src/pcuassert.cxx
--- a/pcu/src/pcuassert.cxx	Fri Oct 07 23:37:14 2011 -0700
+++ b/pcu/src/pcuassert.cxx	Sun Oct 16 04:59:37 2011 -0700
@@ -3,6 +3,6 @@
 
 int pcu_jump_ready = 0;
 jmp_buf pcu_jump_env;
-char* pcu_assert_cur = NULL;
+const char* pcu_assert_cur = NULL;
 
 
diff -r 0e60363584a7 -r 23b1fcc4c8b9 pcu/src/pcuassert.h
--- a/pcu/src/pcuassert.h	Fri Oct 07 23:37:14 2011 -0700
+++ b/pcu/src/pcuassert.h	Sun Oct 16 04:59:37 2011 -0700
@@ -28,7 +28,7 @@
 
 extern int pcu_jump_ready;
 extern jmp_buf pcu_jump_env;
-extern char* pcu_assert_cur;
+extern const char* pcu_assert_cur;
 
 #define pcu_assert( expr )                                      \
    (pcu_jump_ready ?                                            \