I fixed some warnings about multiply defined yy_parse (etc) fuctions.

Did some small indentation fixes, and moved some variables so they
were declared at the top of the function blocks.

Kent

3 files changed, 17 insertions, 19 deletions

diff --git a/intern/elbeem/intern/cfglexer.cpp b/intern/elbeem/intern/cfglexer.cpp
index 0bc9d96b5b2..db5a077f3ff 100644
--- a/intern/elbeem/intern/cfglexer.cpp
+++ b/intern/elbeem/intern/cfglexer.cpp
@@ -815,7 +815,7 @@ char charBuffer[ CHAR_BUFFER_SIZE ];
 
 int lineCount = 1;
 
-extern "C" int yy_wrap (void ) { return 1; }
+/* extern "C" int yy_wrap (void ) { return 1; } */
 #define YY_NO_UNISTD_H
 	
 /*----------------------------------------------------------------------------*/
diff --git a/intern/elbeem/intern/cfgparser.cpp b/intern/elbeem/intern/cfgparser.cpp
index 6ca309f77a5..c797a6da751 100644
--- a/intern/elbeem/intern/cfgparser.cpp
+++ b/intern/elbeem/intern/cfgparser.cpp
@@ -46,7 +46,6 @@
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse yy_parse
 #define yylex   yy_lex
 #define yyerror yy_error
 #define yylval  yy_lval
@@ -287,16 +286,16 @@
 #include <string.h>
 #include "attributes.h"
 
-	void yy_warn(char *s);
-	void yy_error(const char *s);
+void yy_warn(char *s);
+void yy_error(const char *s);
 
-  /* imported from flex... */
-  extern int yy_lex();
-  extern int lineCount;
-  extern FILE *yy_in;
+/* imported from flex... */
+extern int yy_lex();
+extern int lineCount;
+extern FILE *yy_in;
 
-  /* the parse function from bison */
-  int yy_parse( void );
+/* the parse function from bison */
+extern  int yy_parse( void );
 
 // local variables to access objects 
 #include "solver_interface.h"
@@ -2431,6 +2430,3 @@ void parseFile(string filename)
 	}
 }
 
-
-
-
diff --git a/intern/elbeem/intern/solver_relax.h b/intern/elbeem/intern/solver_relax.h
index bc027655be0..589f2197422 100644
--- a/intern/elbeem/intern/solver_relax.h
+++ b/intern/elbeem/intern/solver_relax.h
@@ -1176,7 +1176,12 @@ inline void LbmFsgrSolver::collideArrays(
 	LbmFloat ux = mux;
 	LbmFloat uy = muy;
 	LbmFloat uz = muz; 
-	for(int l=1; l<this->cDfNum; l++) { 
+	LbmFloat feq[19];
+	LbmFloat omegaNew;
+	LbmFloat Qo = 0.0;
+	int l;
+
+	for(l=1; l<this->cDfNum; l++) { 
 		rho += df[l]; 
 		ux  += (this->dfDvecX[l]*df[l]); 
 		uy  += (this->dfDvecY[l]*df[l]);  
@@ -1184,13 +1189,10 @@ inline void LbmFsgrSolver::collideArrays(
 	}  
 
 	PRECOLLIDE_MODS(rho,ux,uy,uz);
-	LbmFloat feq[19];
-	for(int l=0; l<this->cDfNum; l++) { 
+	for(l=0; l<this->cDfNum; l++) { 
 		feq[l] = getCollideEq(l,rho,ux,uy,uz); 
 	}
 
-	LbmFloat omegaNew;
-	LbmFloat Qo = 0.0;
 	if(csmago>0.0) {
 		Qo = getLesNoneqTensorCoeff(df,feq);
 		omegaNew = getLesOmega(omega,csmago,Qo);
@@ -1200,7 +1202,7 @@ inline void LbmFsgrSolver::collideArrays(
 	if(newOmegaRet) *newOmegaRet = omegaNew; // return value for stats
 	if(newQoRet)    *newQoRet = Qo; // return value of non-eq. stress tensor
 
-	for(int l=0; l<this->cDfNum; l++) { 
+	for(l=0; l<this->cDfNum; l++) { 
 		df[l] = (1.0-omegaNew ) * df[l] + omegaNew * feq[l]; 
 	}  
 	if((i==16)&&(j==10)) DEBUG_CALCPRINTCELL( "2dcoll "<<PRINT_IJK, df);