diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-01-12 18:52:41 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-01-12 18:52:41 +0000 |
| commit | 7bb6e8e16962d2201a5d61d5e02a52b4d453786c (patch) | |
| tree | 98ae7f4480fba3b1ce6119b3bacd7fefa8071c31 /src | |
| parent | 1a51ce78ba8eee882730864ecd483f1f39d28e4c (diff) | |
| download | sqlite-7bb6e8e16962d2201a5d61d5e02a52b4d453786c.tar.gz sqlite-7bb6e8e16962d2201a5d61d5e02a52b4d453786c.zip | |
Get things compiling cleanly with MSVC and W4.
FossilOrigin-Name: c8725fa5fa361959b0f0a3fb36f204905d6f0ae9
Diffstat (limited to 'src')
| -rw-r--r-- | src/msvc.h | 3 | ||||
| -rw-r--r-- | src/vdbe.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/msvc.h b/src/msvc.h index c14437d1e..85951c846 100644 --- a/src/msvc.h +++ b/src/msvc.h @@ -20,8 +20,7 @@ #pragma warning(disable : 4127) #pragma warning(disable : 4232) #pragma warning(disable : 4244) -/* #pragma warning(disable : 4701) */ #pragma warning(disable : 4706) -#endif +#endif /* defined(_MSC_VER) */ #endif /* _MSVC_H_ */ diff --git a/src/vdbe.c b/src/vdbe.c index 3dac74dfd..1e0ff96af 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3823,8 +3823,8 @@ case OP_Found: { /* jump, in3 */ /* For the OP_NoConflict opcode, take the jump if any of the ** input fields are NULL, since any key with a NULL will not ** conflict */ - for(ii=0; ii<r.nField; ii++){ - if( r.aMem[ii].flags & MEM_Null ){ + for(ii=0; ii<pIdxKey->nField; ii++){ + if( pIdxKey->aMem[ii].flags & MEM_Null ){ pc = pOp->p2 - 1; VdbeBranchTaken(1,2); break; } |