Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Get things compiling cleanly with MSVC and W4. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | msvcW4 |
| Files: | files | file ages | folders |
| SHA1: |
c8725fa5fa361959b0f0a3fb36f20490 |
| User & Date: | mistachkin 2015-01-12 18:52:41 |
Context
|
2015-01-12
| ||
| 18:52 | Merge updates from trunk. (check-in: ca5f2c54 user: mistachkin tags: msvcW4) | |
| 18:52 | Get things compiling cleanly with MSVC and W4. (check-in: c8725fa5 user: mistachkin tags: msvcW4) | |
| 18:38 | Fix some harmless compiler warnings. (check-in: 2b8eecbf user: mistachkin tags: msvcW4) | |
Changes
Changes to ext/rtree/rtree.c.
2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 |
Rtree *pRtree = (Rtree *)pVtab; int rc = SQLITE_OK; RtreeCell cell; /* New cell to insert if nData>1 */ int bHaveRowid = 0; /* Set to 1 after new rowid is determined */ rtreeReference(pRtree); assert(nData>=1); /* Constraint handling. A write operation on an r-tree table may return ** SQLITE_CONSTRAINT for two reasons: ** ** 1. A duplicate rowid value, or ** 2. The supplied data violates the "x2>=x1" constraint. ** |
> > |
2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 |
Rtree *pRtree = (Rtree *)pVtab;
int rc = SQLITE_OK;
RtreeCell cell; /* New cell to insert if nData>1 */
int bHaveRowid = 0; /* Set to 1 after new rowid is determined */
rtreeReference(pRtree);
assert(nData>=1);
cell.iRowid = 0; /* Used only to suppress a compiler warning */
/* Constraint handling. A write operation on an r-tree table may return
** SQLITE_CONSTRAINT for two reasons:
**
** 1. A duplicate rowid value, or
** 2. The supplied data violates the "x2>=x1" constraint.
**
|
Changes to src/msvc.h.
16 17 18 19 20 21 22 23 24 25 26 27 |
#define _MSVC_H_ #if defined(_MSC_VER) #pragma warning(disable : 4100) #pragma warning(disable : 4127) #pragma warning(disable : 4232) #pragma warning(disable : 4244) /* #pragma warning(disable : 4701) */ #pragma warning(disable : 4706) #endif #endif /* _MSVC_H_ */ |
< < > |
16 17 18 19 20 21 22 23 24 25 26 |
#define _MSVC_H_
#if defined(_MSC_VER)
#pragma warning(disable : 4100)
#pragma warning(disable : 4127)
#pragma warning(disable : 4232)
#pragma warning(disable : 4244)
#pragma warning(disable : 4706)
#endif /* defined(_MSC_VER) */
#endif /* _MSVC_H_ */
|
Changes to src/vdbe.c.
3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 |
sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey);
}
pIdxKey->default_rc = 0;
if( pOp->opcode==OP_NoConflict ){
/* 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 ){
pc = pOp->p2 - 1; VdbeBranchTaken(1,2);
break;
}
}
}
rc = sqlite3BtreeMovetoUnpacked(pC->pCursor, pIdxKey, 0, 0, &res);
if( pOp->p4.i==0 ){
|
| | |
3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 |
sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey);
}
pIdxKey->default_rc = 0;
if( pOp->opcode==OP_NoConflict ){
/* 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<pIdxKey->nField; ii++){
if( pIdxKey->aMem[ii].flags & MEM_Null ){
pc = pOp->p2 - 1; VdbeBranchTaken(1,2);
break;
}
}
}
rc = sqlite3BtreeMovetoUnpacked(pC->pCursor, pIdxKey, 0, 0, &res);
if( pOp->p4.i==0 ){
|