From: mistachkin <mistachkin@noemail.net>
Date: Wed, 7 Mar 2018 14:49:32 +0000 (+0000)
Subject: Fix harmless compiler warning in FTS5.
X-Git-Tag: version-3.23.0~84^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23355215fb0559fc078084abb2d160f7009d9844;p=thirdparty%2Fsqlite.git

Fix harmless compiler warning in FTS5.

FossilOrigin-Name: 2d544711c7e9f4c2c3ca7ee7d588948d048da82e63c82f41c999fce947d6661d
---

diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index a86dbebdf9..03c3d703dd 100644
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -1676,7 +1676,7 @@ Fts5ExprPhrase *sqlite3Fts5ParseTerm(
       ** no token characters at all. (e.g ... MATCH '""'). */
       sCtx.pPhrase = sqlite3Fts5MallocZero(&pParse->rc, sizeof(Fts5ExprPhrase));
     }else if( sCtx.pPhrase->nTerm ){
-      sCtx.pPhrase->aTerm[sCtx.pPhrase->nTerm-1].bPrefix = bPrefix;
+      sCtx.pPhrase->aTerm[sCtx.pPhrase->nTerm-1].bPrefix = (u8)bPrefix;
     }
     pParse->apPhrase[pParse->nPhrase-1] = sCtx.pPhrase;
   }
diff --git a/manifest b/manifest
index bf79846a39..8691ecbc73 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sutility\scompilation\sissues\swith\sMSVC.
-D 2018-03-07T14:42:17.408
+C Fix\sharmless\scompiler\swarning\sin\sFTS5.
+D 2018-03-07T14:49:32.294
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 1d5a68043cc4d8a6e45b37e2639b148cdd7973aa75e90ec71e12d55cd95e32c0
@@ -111,7 +111,7 @@ F ext/fts5/fts5Int.h eda28e3a0a5d87c412e8355fe35da875b04cb389908c8eb0d867ad662ad
 F ext/fts5/fts5_aux.c ca666a3bbe07c5a3bbe9fffaea19c935a1efaf337333e28bad7bdd1971ffd093
 F ext/fts5/fts5_buffer.c 1dd1ec0446b3acfc2d7d407eb894762a461613e2695273f48e449bfd13e973ff
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
-F ext/fts5/fts5_expr.c 01048018d21524e2c302b063ff5c3cdcf546e03297215e577205d85b47499deb
+F ext/fts5/fts5_expr.c c23a2e4c14c401a147c4a730460e5b37057627bf4be95515ee281cd87f4d277c
 F ext/fts5/fts5_hash.c 32be400cf761868c9db33efe81a06eb19a17c5402ad477ee9efb51301546dd55
 F ext/fts5/fts5_index.c 22b71d0e9e4b3ddd123a39ae27174e0012da2806f91b64087a68584f13f189de
 F ext/fts5/fts5_main.c 24868f88ab2a865defbba7a92eebeb726cc991eb092b71b5f5508f180c72605b
@@ -1710,10 +1710,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 fc42d31d6fca21abc5377a463ed800e3066b2f3fbd2d85cb486f402d2ae7cb15
-R 49f05f1d65bbeae0b87d971f79e7a40c
-T *branch * msvcFixes
-T *sym-msvcFixes *
-T -sym-trunk *
+P 5bd5a79898790bef150b2bc7f275333444b1a723385e595931377ff4d32190bf
+R 8691caa0eeb15b0c1d92fa042c93988a
 U mistachkin
-Z 37796102b64447100403e8be38ecf33a
+Z 4c51f8288d5bfd11277f1046c62d8466
diff --git a/manifest.uuid b/manifest.uuid
index 1639470573..b925eeca5a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5bd5a79898790bef150b2bc7f275333444b1a723385e595931377ff4d32190bf
\ No newline at end of file
+2d544711c7e9f4c2c3ca7ee7d588948d048da82e63c82f41c999fce947d6661d
\ No newline at end of file