From: mistachkin <mistachkin@noemail.net>
Date: Thu, 10 Oct 2019 23:58:16 +0000 (+0000)
Subject: Fix harmless compiler warning seen with MSVC.
X-Git-Tag: version-3.31.0~413
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6dcf9a451e6e4ed1ae343c4813958540ac836306;p=thirdparty%2Fsqlite.git

Fix harmless compiler warning seen with MSVC.

FossilOrigin-Name: 73a82114733af2a316f20eb8578badef307d14286c6ec03197744a6793425161
---

diff --git a/manifest b/manifest
index 2ecb08a69b..a5c9cbf72e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sSQLite\sfrom\sassuming\sthat\sif\s((?\sIS\sNOT\sNULL)\sIS\sNOT\sNULL)\sis\strue,\s?\smay\snot\sbe\sNULL.\sFix\sfor\s[d51a8696].
-D 2019-10-10T17:09:44.963
+C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC.
+D 2019-10-10T23:58:16.392
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,7 @@ F src/trigger.c 845ccc08f60716c58aa28fe6470385c18ef8c4e1d88c93dcf449bc13d464eb2e
 F src/update.c 7f05fad5e145248a00048aeb0bac78b8fdb4ed17216e14a6eb24c55596e87ee7
 F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
-F src/util.c fffdfa627be74d69ef425f92db124e7148af449bb8a3286e79577c42bca84061
+F src/util.c 10d910e04a4f3842042485e0df01a484f57f912c10b60b3a09ccddd5019bd138
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 F src/vdbe.c 6df0a99dfbdd9dec542a94f06dd9a8a575acc87047937b2b801ac9d68eb3c96f
 F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf
@@ -1846,7 +1846,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 629e20c9880acc2cb9e2fa6da39a15a90483e9a8f433df29d285c23bdfb03b0b
-R c986e09ece8f3de56032bcbf04625250
-U dan
-Z 0b8951352c5f65b37b4ebe46a258877d
+P 7833feecfe745e237f239ee4c38a9e4bf7ad66a32919150208da87c00a826473
+R f00378c448d9bb1d9bbacc01afc3ba1a
+U mistachkin
+Z 1126cf0ca18de2bf402e76e92ac78399
diff --git a/manifest.uuid b/manifest.uuid
index d1c1d85e2f..763c305159 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7833feecfe745e237f239ee4c38a9e4bf7ad66a32919150208da87c00a826473
\ No newline at end of file
+73a82114733af2a316f20eb8578badef307d14286c6ec03197744a6793425161
\ No newline at end of file
diff --git a/src/util.c b/src/util.c
index 7adce4ef03..d28950d266 100644
--- a/src/util.c
+++ b/src/util.c
@@ -382,6 +382,9 @@ static LONGDOUBLE_TYPE sqlite3Pow10(int E){
 ** returns FALSE but it still converts the prefix and writes the result
 ** into *pResult.
 */
+#if defined(_MSC_VER)
+#pragma warning(disable : 4756)
+#endif
 int sqlite3AtoF(const char *z, double *pResult, int length, u8 enc){
 #ifndef SQLITE_OMIT_FLOATING_POINT
   int incr;
@@ -569,6 +572,9 @@ do_atof_calc:
   return !sqlite3Atoi64(z, pResult, length, enc);
 #endif /* SQLITE_OMIT_FLOATING_POINT */
 }
+#if defined(_MSC_VER)
+#pragma warning(default : 4756)
+#endif
 
 /*
 ** Compare the 19-character string zNum against the text representation