Fix compiler warnings on GCC and MSVC and fix a C89-ism that

broke the build for MSVC.

FossilOrigin-Name: b451c0f97f0abe78ebe6c62ff489ec1ad8a1f767
This commit is contained in:
drh
2012-03-30 00:00:36 +00:00
parent 06801f6ff0
commit 4e245a4c35
5 changed files with 20 additions and 19 deletions
+3 -3
View File
@@ -2599,11 +2599,11 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
** loading.
*/
if( (pDef->flags & (SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF))!=0 ){
u8 op;
u8 exprOp;
assert( nFarg==1 );
assert( pFarg->a[0].pExpr!=0 );
op = pFarg->a[0].pExpr->op;
if( op==TK_COLUMN || op==TK_AGG_COLUMN ){
exprOp = pFarg->a[0].pExpr->op;
if( exprOp==TK_COLUMN || exprOp==TK_AGG_COLUMN ){
assert( SQLITE_FUNC_LENGTH==OPFLAG_LENGTHARG );
assert( SQLITE_FUNC_TYPEOF==OPFLAG_TYPEOFARG );
testcase( pDef->flags==SQLITE_FUNC_LENGTH );