Further to the previous check-in, remove the "harmless()" macro definition as

it is no longer used.

FossilOrigin-Name: b8c9a54664a87ac464b413390572c3feb912e1efc9c8a78c61f1b370e2165c05

diff --git a/manifest b/manifest
index fe9a7746624db9522fd7d48860441905bb5819d6..6488eea9373d93331e97f9b162aafcb2b3bc19b0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\s"harmless()"\smacro\sthat\sis\sno\slonger\srelevant.
-D 2021-10-08T18:12:37.220
+C Further\sto\sthe\sprevious\scheck-in,\sremove\sthe\s"harmless()"\smacro\sdefinition\sas\nit\sis\sno\slonger\sused.
+D 2021-10-08T18:15:50.320
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -554,7 +554,7 @@ F src/shell.c.in ac685e63c506fb2e39375c83347c88bff84dc48fa5d6a59f508d7d67951693a
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
-F src/sqliteInt.h 1c533af6ddc8bac06db0706698227b1a04d3c25a439dae5f1d72d672e51a6244
+F src/sqliteInt.h ef4da7ea99a18dd8975636e050b5eddc5576b55da127a8c7a80983c3ee608d25
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1928,7 +1928,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 a51b305bd068f8d8e85b9fc38d61cdf5957f3a2ad2eb2e77015547910088e681
-R fd484d3c128a2ea8cf0418a51903c533
+P 87c357c60168fdc52c82382aa7288d66886f5fbe2ae6af68344dbcfdbca9069b
+R 1cc86c723eae430b905815a96dda1490
 U drh
-Z 279abe732b42272c57b1f99ac8bf0794
+Z bcca30cb5ad97f8aa9cbbd8a97fe1387

diff --git a/manifest.uuid b/manifest.uuid
index c74aa093d422cd15c0b805066b0b8c6bd69d357f..1f7e054b7393cc60f812bf23793e4c21764695e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87c357c60168fdc52c82382aa7288d66886f5fbe2ae6af68344dbcfdbca9069b
\ No newline at end of file
+b8c9a54664a87ac464b413390572c3feb912e1efc9c8a78c61f1b370e2165c05
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 67a50e836889baf22986faeb819f7df079d02a5f..d1885ebc6c4406209d69a99ac6dec699d6b04850 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -503,26 +503,6 @@
 # define NEVER(X)       (X)
 #endif
 
-/*
-** The harmless(X) macro indicates that expression X is usually false
-** but can be true without causing any problems, but we don't know of
-** any way to cause X to be true.
-**
-** In debugging and testing builds, this macro will abort if X is ever
-** true.  In this way, developers are alerted to a possible test case
-** that causes X to be true.  If a harmless macro ever fails, that is
-** an opportunity to change the macro into a testcase() and add a new
-** test case to the test suite.
-**
-** For normal production builds, harmless(X) is a no-op, since it does
-** not matter whether expression X is true or false.
-*/
-#ifdef SQLITE_DEBUG
-# define harmless(X)  assert(!(X));
-#else
-# define harmless(X)
-#endif
-
 /*
 ** Some conditionals are optimizations only.  In other words, if the
 ** conditionals are replaced with a constant 1 (true) or 0 (false) then