From: mistachkin <mistachkin@noemail.net>
Date: Sat, 30 Jul 2016 18:54:54 +0000 (+0000)
Subject: Fix harmless compiler warning seen with MSVC.
X-Git-Tag: version-3.14.0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19e76b2a7cf4b1b42f2d90ef27ea852603206bb2;p=thirdparty%2Fsqlite.git

Fix harmless compiler warning seen with MSVC.

FossilOrigin-Name: 390a38a142d36d2c57b3f21aab72edcde450125d
---

diff --git a/manifest b/manifest
index ddf53b746a..9657203bbb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Using\sthe\sheader\sfile\s'intrin.h'\srequires\sMSVC\s2005\sor\slater.
-D 2016-07-29T17:36:27.088
+C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC.
+D 2016-07-30T18:54:54.989
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@ -463,7 +463,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
-F src/where.c fcaa38d19c2a7bb450cc57810bdc3d4eb36e00b0
+F src/where.c bb1444f6ae6bc3cbd086cc61cd9c6e3a6168d89b
 F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
@@ -1508,7 +1508,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 544c990afd3b64064cc4d970ec5d7eb23eeb9914
-R ceef2b71453325469cbc16ff7674c4c9
+P 9fae75c08b7d3b3e13734193ad8398ef6971cbac
+R 20430021b7d310aa0691f2edba10b981
 U mistachkin
-Z 0275ffb3719041525e752ce514a5292f
+Z 1a5ea8a378b7c26f7d4d45026b5640de
diff --git a/manifest.uuid b/manifest.uuid
index 5827550e55..dedb9c60d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9fae75c08b7d3b3e13734193ad8398ef6971cbac
\ No newline at end of file
+390a38a142d36d2c57b3f21aab72edcde450125d
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index da41c142fa..9b3c281efc 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2786,9 +2786,9 @@ static int whereLoopAddBtree(
           LogEst nLookup = rSize + 16;  /* Base cost:  N*3 */
           int ii;
           int iCur = pSrc->iCursor;
-          WhereClause *pWC = &pWInfo->sWC;
-          for(ii=0; ii<pWC->nTerm; ii++){
-            WhereTerm *pTerm = &pWC->a[ii];
+          WhereClause *pWC2 = &pWInfo->sWC;
+          for(ii=0; ii<pWC2->nTerm; ii++){
+            WhereTerm *pTerm = &pWC2->a[ii];
             if( !sqlite3ExprCoveredByIndex(pTerm->pExpr, iCur, pProbe) ){
               break;
             }