diff options
author | drh <drh@noemail.net> | 2014-01-24 22:58:00 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-01-24 22:58:00 +0000 |
commit | 693e671936cd7053e874186228b9b0454a643893 (patch) | |
tree | 4e0776d9f894fda382f18a621fe097777d4bbf21 /src/expr.c | |
parent | 53bed45ecb66ba6ddd835a448adebdb61c2a81dc (diff) | |
download | sqlite-693e671936cd7053e874186228b9b0454a643893.tar.gz sqlite-693e671936cd7053e874186228b9b0454a643893.zip |
Fixes for various clang warnings.
FossilOrigin-Name: 87bf60637e5863c54c5e2d05aaaca0835b7aace8
Diffstat (limited to 'src/expr.c')
-rw-r--r-- | src/expr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c index 2e8079eb8..a48a31f93 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2685,7 +2685,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ FuncDef *pDef; /* The function definition object */ int nId; /* Length of the function name in bytes */ const char *zId; /* The function name */ - int constMask = 0; /* Mask of function arguments that are constant */ + u32 constMask = 0; /* Mask of function arguments that are constant */ int i; /* Loop counter */ u8 enc = ENC(db); /* The text encoding used by this database */ CollSeq *pColl = 0; /* A collating sequence */ @@ -2736,7 +2736,8 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ for(i=0; i<nFarg; i++){ if( i<32 && sqlite3ExprIsConstant(pFarg->a[i].pExpr) ){ - constMask |= (1<<i); + testcase( i==31 ); + constMask |= MASKBIT32(i); } if( (pDef->funcFlags & SQLITE_FUNC_NEEDCOLL)!=0 && !pColl ){ pColl = sqlite3ExprCollSeq(pParse, pFarg->a[i].pExpr); |