Remove incorrect NEVER() macro added by the previous check-in.

FossilOrigin-Name: 3d6625111319c0356c57aaf7b7460fd882c3f00ca668dc43c0abe3403c7c2ba3

diff --git a/manifest b/manifest
index 35568654767c2bb259e0a87eb7c2b94ac9e77b41..6ce6e677e667dca6751a925c0347c17283f137b7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\ssqlite3IntFloatCompare()\sroutine\sfor\ssystems\sthat\nlack\sthe\slong\sdouble\stype.
-D 2018-05-18T13:39:00.453
+C Remove\sincorrect\sNEVER()\smacro\sadded\sby\sthe\sprevious\scheck-in.
+D 2018-05-18T14:19:35.018
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -567,7 +567,7 @@ F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
 F src/vdbe.h d970d9738efdd09cb2df73e3a40856e7df13e88a3486789c49fcdd322c9eb8a2
 F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
-F src/vdbeaux.c 8442dd6b7aec70e034cee8221ca8fd906706c475072390e3cb8d9b498b31f4c5
+F src/vdbeaux.c 3b0650dbebebb196010d8af830551e61ea7dcc0e414a2b747f897305b0bd0b8f
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
 F src/vdbemem.c 0cbe9b9560e42b72983cf9e1bceba48f297e51142bfb6b57f3747cf60106b92d
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@ -1728,7 +1728,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 33dc8fad7f2b467f259eb78eb7342a760f01d54d95da7fe4cace10e558788a58
-R 172d94da653421dfa4a13bdf39921f71
+P ea6a03a89dc23e860e53e79ec3fddf0ae7072a23b73aef3d2d181b426566b677
+R 95f9dad3dedc0c1d42618371aa8f363f
 U drh
-Z c89655e68cdf9c04b590b1bb59f1f9b2
+Z e422d7782a1b78611c0889726293f8af

diff --git a/manifest.uuid b/manifest.uuid
index b6047ecbff0e8658af033de12744092be33a295e..fd4db6cc22e0b0a361bd6c9e6e74452f0a6cd5c4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea6a03a89dc23e860e53e79ec3fddf0ae7072a23b73aef3d2d181b426566b677
\ No newline at end of file
+3d6625111319c0356c57aaf7b7460fd882c3f00ca668dc43c0abe3403c7c2ba3
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 76b46acbb818b68c091e735bc61c0ea6935f6655..4b07647519a052e86cec402ab821a1f7b3230308 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3923,7 +3923,7 @@ static int sqlite3IntFloatCompare(i64 i, double r){
     if( i>y ) return +1;
     s = (double)i;
     if( s<r ) return -1;
-    if( NEVER(s>r) ) return +1;
+    if( s>r ) return +1;
     return 0;
   }
 }