Fix some harmless compiler warnings seen with MSVC.

FossilOrigin-Name: 78862252da7f59d4737ed16f4ccf100cea27d8b421db31051afbaa8d96f24de3

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 51a519cf01311c657f9e366115402985c5a28482..85b1143f83cebe69683c3e1d2629d23bd6496d2e 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1836,11 +1836,11 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){
       if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
       assert( pStr->bStatic );
     }else if( isFinal ){
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
+      sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed,
                           pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
       pStr->bStatic = 1;
     }else{
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT);
+      sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT);
       pStr->nUsed--;
     }
   }else{
@@ -1889,7 +1889,7 @@ static void jsonGroupInverse(
     }
   }
   pStr->nUsed -= i;      
-  memmove(&z[1], &z[i+1], pStr->nUsed-1);
+  memmove(&z[1], &z[i+1], (size_t)pStr->nUsed-1);
 }
 #else
 # define jsonGroupInverse 0
@@ -1935,11 +1935,11 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){
       if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
       assert( pStr->bStatic );
     }else if( isFinal ){
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
+      sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed,
                           pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
       pStr->bStatic = 1;
     }else{
-      sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed, SQLITE_TRANSIENT);
+      sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT);
       pStr->nUsed--;
     }
   }else{

diff --git a/ext/rtree/geopoly.c b/ext/rtree/geopoly.c
index b4f6f08d16168d2c4243310390cbeadab6114753..a34ca12fc7c0b70ebdda07a5e74ac8c5f3e7efcf 100644 (file)
--- a/ext/rtree/geopoly.c
+++ b/ext/rtree/geopoly.c
@@ -180,7 +180,7 @@ static int geopolyParseNumber(GeoParse *p, GeoCoord *pVal){
     break;
   }
   if( z[j-1]<'0' ) return 0;
-  if( pVal ) *pVal = atof((const char*)p->z);
+  if( pVal ) *pVal = (GeoCoord)atof((const char*)p->z);
   p->z += j;
   return 1;
 }
@@ -435,8 +435,8 @@ static void geopolyXformFunc(
     for(ii=0; ii<p->nVertex; ii++){
       x0 = p->a[ii*2];
       y0 = p->a[ii*2+1];
-      x1 = A*x0 + B*y0 + E;
-      y1 = C*x0 + D*y0 + F;
+      x1 = (GeoCoord)(A*x0 + B*y0 + E);
+      y1 = (GeoCoord)(C*x0 + D*y0 + F);
       p->a[ii*2] = x1;
       p->a[ii*2+1] = y1;
     }
@@ -511,11 +511,11 @@ static GeoPoly *geopolyBBox(
     mnY = mxY = p->a[1];
     for(ii=1; ii<p->nVertex; ii++){
       double r = p->a[ii*2];
-      if( r<mnX ) mnX = r;
-      else if( r>mxX ) mxX = r;
+      if( r<mnX ) mnX = (float)r;
+      else if( r>mxX ) mxX = (float)r;
       r = p->a[ii*2+1];
-      if( r<mnY ) mnY = r;
-      else if( r>mxY ) mxY = r;
+      if( r<mnY ) mnY = (float)r;
+      else if( r>mxY ) mxY = (float)r;
     }
     if( pRc ) *pRc = SQLITE_OK;
     if( aCoord==0 ){

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 06efdc71f4545e7e67fa2a7353a5e22955d1f551..c00648f6a24cbc1bef4877a22b1db3c141b52ed6 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -3273,7 +3273,7 @@ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){
 */
 static int rtreeSavepoint(sqlite3_vtab *pVtab, int iSavepoint){
   Rtree *pRtree = (Rtree *)pVtab;
-  int iwt = pRtree->inWrTrans;
+  u8 iwt = pRtree->inWrTrans;
   UNUSED_PARAMETER(iSavepoint);
   pRtree->inWrTrans = 0;
   nodeBlobReset(pRtree);

diff --git a/manifest b/manifest
index ff96c4c2b7bb8fbb39fa8e4d1b05d686524e3629..bf17910a00975cb2c1def4cc908a7d66177fd0a9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sMSVC,\smigrate\ssome\scommonly\sused\sshell\scompilation\soptions\sto\sthe\slibrary.
-D 2018-09-12T00:48:17.395
+C Fix\ssome\sharmless\scompiler\swarnings\sseen\swith\sMSVC.
+D 2018-09-12T01:05:26.985
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@ -284,7 +284,7 @@ F ext/misc/eval.c 6ea9b22a5fa0dd973b67ca4e53555be177bc0b7b263aadf1024429457c82c0
 F ext/misc/fileio.c 7317d825fab6a3c48f6e3822a00a6a22e08e55af31700ac96f16a523f83069fd
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c 34a31eac76aeec269657f6f84a72533600d511005efa5dd97034909a2a0fbc9a
+F ext/misc/json1.c 276f87dc8365b34b0fffb7ef32481dd07fac6fdb3224e2822396a48377ac8363
 F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
 F ext/misc/mmapwarm.c 70b618f2d0bde43fae288ad0b7498a629f2b6f61b50a27e06fae3cd23c83af29
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
@@ -359,8 +359,8 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782
 F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/geopoly.c 447df73929d87c35fe41f2b80c3fcd3da7d15fe41f127a52c820653696f05857
-F ext/rtree/rtree.c ce94cbb319423fd739702582dde47371aec8ad85207d517c41bdbf75a7ffd737
+F ext/rtree/geopoly.c 415a8ca5dfab54eea779e0bf31a859afb0b869a5147a726df4aec4b57c1bad57
+F ext/rtree/rtree.c 6cc2e673cf1e9ea1619f13ab990f12389dfb951b131acbc2fbe164cee8992a20
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 309afc04d4287542b2cd74f933296832cc681c7b014d9405cb329b62053a5349
 F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@ -472,7 +472,7 @@ F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
 F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memdb.c e94c478a757c4307fd170fe0a7650ef4cf722c59e5a95a8a7896ffedc1679139
+F src/memdb.c cb4013d56fa71c79c498717cbc47b27dd1c7653fd866584b2071ae04114eec46
 F src/memjournal.c 6f3d36a0a8f72f48f6c3c722f04301ac64f2515435fa42924293e46fc7994661
 F src/msvc.h 4942752b6a253116baaa8de75256c51a459a5e81
 F src/mutex.c bae36f8af32c22ad80bbf0ccebec63c252b6a2b86e4d3e42672ff287ebf4a604
@@ -1765,7 +1765,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f578e62ae6f6cc78d8281adab9fa93f3f58711879c2860bbe19f291d257dc0af
-R 92276a38c8d65a1dc42dc006e0b2e3af
+P 68a71e5f4e9cbd15eb64d271008e29f40913480bac467b90fb64f0269ad75818
+R ea7ede760301140f4db233d739ba55aa
 U mistachkin
-Z 199141bcdfd2ec1e4225bb6420cc2c82
+Z 85ec20e6f2e7f32f2d2d0c9001bd7e5a

diff --git a/manifest.uuid b/manifest.uuid
index 54e944eb9bdc45892fe2277ed8794ca8f502c8b2..f191da2d67934135fc363a1293857c2c77206da6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-68a71e5f4e9cbd15eb64d271008e29f40913480bac467b90fb64f0269ad75818
\ No newline at end of file
+78862252da7f59d4737ed16f4ccf100cea27d8b421db31051afbaa8d96f24de3
\ No newline at end of file

diff --git a/src/memdb.c b/src/memdb.c
index 44189852ea98abee89702d2946f7df6a8c203690..7723d40525ba8edc935420a209986247b90957bc 100644 (file)
--- a/src/memdb.c
+++ b/src/memdb.c
@@ -16,8 +16,8 @@
 ** This file also implements interface sqlite3_serialize() and
 ** sqlite3_deserialize().
 */
-#ifdef SQLITE_ENABLE_DESERIALIZE
 #include "sqliteInt.h"
+#ifdef SQLITE_ENABLE_DESERIALIZE
 
 /*
 ** Forward declaration of objects used by this utility