]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix a harmless compiler warning in rtree.
authordrh <drh@noemail.net>
Thu, 1 Jan 2015 16:47:43 +0000 (16:47 +0000)
committerdrh <drh@noemail.net>
Thu, 1 Jan 2015 16:47:43 +0000 (16:47 +0000)
FossilOrigin-Name: 30891c6b8ebe9dfc939f9695bb45a159fbaaf262

ext/rtree/rtree.c
manifest
manifest.uuid

index 8150538d452d1b31ebc91b54b5fcb3e6dad8f3aa..57b38de03db3e5a84c7c58e46fb1df6cb843ee77 100644 (file)
@@ -1182,7 +1182,7 @@ static RtreeSearchPoint *rtreeEnqueue(
   pNew = pCur->aPoint + i;
   pNew->rScore = rScore;
   pNew->iLevel = iLevel;
-  assert( iLevel>=0 && iLevel<=RTREE_MAX_DEPTH );
+  assert( iLevel<=RTREE_MAX_DEPTH );
   while( i>0 ){
     RtreeSearchPoint *pParent;
     j = (i-1)/2;
index 4094f7cc8a24c55e0d6cdbe2bcba03715711b43e..b7c08125594bda7d94fc854a73af4eaa13502134 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stwo\stest\scases\sin\smemsubsys1\sso\sthat\sthey\swork\swith\sthe\smmap\spermutation.
-D 2015-01-01T14:13:45.725
+C Fix\sa\sharmless\scompiler\swarning\sin\srtree.
+D 2015-01-01T16:47:43.069
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7cd23e4fc91004a6bd081623e1bc6932e44828c0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -124,7 +124,7 @@ F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 57bec53e1a677ab74217fe1f20a58c3a47261d6b
+F ext/rtree/rtree.c a03ebd2480a1a4969cb363bb696d9d911e5a6ecd
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1234,7 +1234,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 5830c557f7ed048056e2faeb82a8705ee7ecfdd7
-R 9ee216f4d87447d224436bd4fa1652bd
+P 66269d0d8e49eb3dc7f508714753584f648bb022
+R e5d27e633a5b491c2ea88ea18c8cfd90
 U drh
-Z f94d536f9021f3614a2a0370bbcf66ff
+Z a7e9ba08973a7605802bac8950dbf017
index 6e46921ab550758157d3c3ab1f511997446a195f..c0a63b890da5d8f403e141d50156ffad3c84cdc2 100644 (file)
@@ -1 +1 @@
-66269d0d8e49eb3dc7f508714753584f648bb022
\ No newline at end of file
+30891c6b8ebe9dfc939f9695bb45a159fbaaf262
\ No newline at end of file