[cig-commits] commit: Fix compile errors on cygwin

[Mercurial]

changeset:   822:e85896016ced
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Fri Nov 25 16:03:54 2011 -0800
files:       SLE/SystemSetup/src/MultigridSolver.cxx SLE/SystemSetup/src/PETScMGSolver.cxx
description:
Fix compile errors on cygwin


diff -r 10a7d7ab0720 -r e85896016ced SLE/SystemSetup/src/MultigridSolver.cxx
--- a/SLE/SystemSetup/src/MultigridSolver.cxx	Fri Nov 25 14:41:10 2011 -0800
+++ b/SLE/SystemSetup/src/MultigridSolver.cxx	Fri Nov 25 16:03:54 2011 -0800
@@ -558,10 +558,10 @@ void MultigridSolver_SetRestriction( voi
 	//	Stg_Class_AddRef( R );
 }
 
-void MultigridSolver_SetProlongation( void* matrixSolver, unsigned levelInd, void* _P ) {
+void MultigridSolver_SetProlongation( void* matrixSolver, unsigned levelInd, void* PP ) {
 	MultigridSolver*	self 	= (MultigridSolver*)matrixSolver;
 	MultigridSolver_Level*	level;
-	Mat			P	= (Mat)_P;
+	Mat			P	= (Mat)PP;
 
 	assert( self && Stg_CheckType( self, MultigridSolver ) );
 	assert( levelInd < self->nLevels && levelInd > 0 );
diff -r 10a7d7ab0720 -r e85896016ced SLE/SystemSetup/src/PETScMGSolver.cxx
--- a/SLE/SystemSetup/src/PETScMGSolver.cxx	Fri Nov 25 14:41:10 2011 -0800
+++ b/SLE/SystemSetup/src/PETScMGSolver.cxx	Fri Nov 25 16:03:54 2011 -0800
@@ -362,10 +362,10 @@ void PETScMGSolver_SetRestriction( void*
 	level->R = R;
 }
 
-void PETScMGSolver_SetProlongation( void* matrixSolver, unsigned levelInd, void* _P ) {
+void PETScMGSolver_SetProlongation( void* matrixSolver, unsigned levelInd, void* PP ) {
 	PETScMGSolver*		self 	= (PETScMGSolver*)matrixSolver;
 	PETScMGSolver_Level*	level;
-	Mat			P	= (Mat)_P;
+	Mat			P	= (Mat)PP;
 
 	assert( self && Stg_CheckType( self, PETScMGSolver ) );
 	assert( levelInd < self->nLevels && levelInd > 0 );