]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix harmless compiler warnings seen with MSVC.
authormistachkin <mistachkin@noemail.net>
Wed, 1 Feb 2017 23:06:17 +0000 (23:06 +0000)
committermistachkin <mistachkin@noemail.net>
Wed, 1 Feb 2017 23:06:17 +0000 (23:06 +0000)
FossilOrigin-Name: 0c66cf0f0a9ada2ddcb8d61001ef791b86226416

1  2 
ext/rtree/rtree.c
manifest
manifest.uuid

Simple merge
diff --cc manifest
index 257674eec117d1d366a8e1cd89df1a73e68df4a2,1d0d4582333a6c037111c3c65030a91219ccb501..6459c8e5add680cde3c8e59b5716fca97e6a8835
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Backout\sthe\schange\sin\s[02f6293f27]\sas\sit\scauses\sMSVC\sto\scomplain.
- D 2017-02-01T23:03:54.479
+ C Fix\sharmless\scompiler\swarnings\sseen\swith\sMSVC.
 -D 2017-02-01T22:43:08.270
++D 2017-02-01T23:06:17.747
  F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@@ -264,7 -264,7 +264,7 @@@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 58d3fa51e270b93e1d4ceb7ffb5c0f3b85cb4129
 -F ext/rtree/rtree.c 880edfc9a342c130fb2e220c4d7471729e764334
++F ext/rtree/rtree.c 70f2488eef5c04dccf15a52cbd4961492124f825
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -1552,8 -1552,10 +1552,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 54d285464a222c59327eb6c917c1cc0125a55a27
- Q -02f6293f278f7b0a0f4876f5c6a0f4dc42620d79
- R c167920e65eb1311d91ae6d6e9361130
 -P 6a378c29b43d61313ca9daa599e59d8eeeed9a27
 -R 1fd2d9b1d5e3d137e94e02ebe9288650
 -T *branch * msvcWarn
 -T *sym-msvcWarn *
 -T -sym-trunk *
++P aaae74d06f4865818465cfdb440258ae8a5b985a 997f765bc6706769ae15f3e719354473e02bd78b
++R 939bce209d57b72db3d58f9894d61374
++T +closed 997f765bc6706769ae15f3e719354473e02bd78b
  U mistachkin
- Z 464bc0b25a9ceacfcf91d7e8480e3c64
 -Z c7bdc5431b2e37708dfabf3606031db2
++Z c2a7081e9858115a573bd4695718af54
diff --cc manifest.uuid
index 6df479bdb38ad93b5243b6788c1079c0b28a0ab7,365c5fd48f618e6345ec57507195159e98e696b0..0e343416858d42e69462b5d685a8d543a0ca7875
@@@ -1,1 -1,1 +1,1 @@@
- aaae74d06f4865818465cfdb440258ae8a5b985a
 -997f765bc6706769ae15f3e719354473e02bd78b
++0c66cf0f0a9ada2ddcb8d61001ef791b86226416