database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Get things compiling cleanly with MSVC and W4.

Browse Source 
FossilOrigin-Name: c8725fa5fa361959b0f0a3fb36f204905d6f0ae9
This commit is contained in:
mistachkin
2015-01-12 18:52:41 +00:00
parent 1a51ce78ba
commit 7bb6e8e169
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/rtree/rtree.c
View File

@ -2806,6 +2806,8 @@ static int rtreeUpdate(
rtreeReference(pRtree); rtreeReference(pRtree);
assert(nData>=1); 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 /* Constraint handling. A write operation on an r-tree table may return
** SQLITE_CONSTRAINT for two reasons: ** SQLITE_CONSTRAINT for two reasons:
** **

16
manifest
View File

@ -1,5 +1,5 @@
C Fix\ssome\sharmless\scompiler\swarnings. C Get\sthings\scompiling\scleanly\swith\sMSVC\sand\sW4.
D 2015-01-12T18:38:02.224 D 2015-01-12T18:52:41.112
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 33a180534a9ba2cf80f5f87e8288c26423d0a8d1 F Makefile.in 33a180534a9ba2cf80f5f87e8288c26423d0a8d1
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -124,7 +124,7 @@ F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
F ext/rtree/rtree.c a03ebd2480a1a4969cb363bb696d9d911e5a6ecd F ext/rtree/rtree.c b61e9eab7229a443d0d2029da7624299e19301a2
F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9 F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@ -203,7 +203,7 @@ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85 F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
F src/msvc.h f9a7b17a5fbc4ddaca0339128e56aed20256d309 F src/msvc.h 546453caaf5227521f1fb87a5033b37e00675608
F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8 F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1 F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
@ -292,7 +292,7 @@ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73 F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
F src/vdbe.c 1a9e671c9cfc259e4d2affc71f7df4a4c00a842c F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78 F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71 F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
@ -1236,7 +1236,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 43b6b4cc051e5a801a992c56d2c82abcdcf45cec P 2b8eecbfe7935d3d9826fbcd473dd3a49138ad11
R bba3af3a356e680f16cb17ee14d2767c R 23426bb53239eb240dd8df9d0d219aeb
U mistachkin U mistachkin
Z d67b74d2cb1318ffa320cad7c97c91ba Z 96c406dd077f9e953d8ddb5aba51e0dd

2
manifest.uuid
View File

@ -1 +1 @@
2b8eecbfe7935d3d9826fbcd473dd3a49138ad11 c8725fa5fa361959b0f0a3fb36f204905d6f0ae9

3
src/msvc.h
View File

@ -20,8 +20,7 @@
#pragma warning(disable : 4127) #pragma warning(disable : 4127)
#pragma warning(disable : 4232) #pragma warning(disable : 4232)
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
/* #pragma warning(disable : 4701) */
#pragma warning(disable : 4706) #pragma warning(disable : 4706)
#endif #endif /* defined(_MSC_VER) */
#endif /* _MSVC_H_ */ #endif /* _MSVC_H_ */

4
src/vdbe.c
View File

@ -3823,8 +3823,8 @@ case OP_Found: { /* jump, in3 */
/* For the OP_NoConflict opcode, take the jump if any of the /* For the OP_NoConflict opcode, take the jump if any of the
** input fields are NULL, since any key with a NULL will not ** input fields are NULL, since any key with a NULL will not
** conflict */ ** conflict */
for(ii=0; ii<r.nField; ii++){ for(ii=0; ii<pIdxKey->nField; ii++){
if( r.aMem[ii].flags & MEM_Null ){ if( pIdxKey->aMem[ii].flags & MEM_Null ){
pc = pOp->p2 - 1; VdbeBranchTaken(1,2); pc = pOp->p2 - 1; VdbeBranchTaken(1,2);
break; break;
} }