From: drh <drh@noemail.net>
Date: Sat, 5 Nov 2005 15:11:22 +0000 (+0000)
Subject: Work around a bug in MSVC++.  Ticket #1513. (CVS 2763)
X-Git-Tag: version-3.6.10~3397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=152410fadeed7852c7155fc1da62c0891448d7be;p=thirdparty%2Fsqlite.git

Work around a bug in MSVC++.  Ticket #1513. (CVS 2763)

FossilOrigin-Name: 6331860e7754be6e0d2a484d66427947c0781dd6
---

diff --git a/manifest b/manifest
index 73c9d98dd0..32f1c93969 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sC++-ism\sthat\sslipped\sinto\sthe\scode\sduring\sthe\srecent\sCHECK\nenhancements.\s\sTicket\s#1513.\s(CVS\s2762)
-D 2005-11-05T15:07:56
+C Work\saround\sa\sbug\sin\sMSVC++.\s\sTicket\s#1513.\s(CVS\s2763)
+D 2005-11-05T15:11:23
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -57,7 +57,7 @@ F src/os_unix.c 2af2d2cea9cc6282c02b48aacf2995193440cf00
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c fbccc85e7011174068c27d54256746321a1f0059
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 0d8dda8bba9efbda30626cdc3c6573fe10adafdc
+F src/pager.c ca23cdff9e67a8e826e4796c60f06db6aab69b72
 F src/pager.h e7b41ce8e7b5f629d456708b7ad9a8c8ede37140
 F src/parse.y 1d5afb972ed5ef3ec8712a2b5953b48f086091da
 F src/pragma.c b40189967155a522433b8470f363192a927ba22c
@@ -317,7 +317,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 86ac11476962727d2d40b62ce87d689c01969537
-R 9a16191c624a634ada9ef30eb37671af
+P e66289b52f56c8242aa264a9365c834cd820e988
+R 9199262fb53b49fec9604daa08dac2c4
 U drh
-Z 2e997b85f90ec5cddf82f0239d534b9f
+Z b5fb95f8a7e272d62cd13eee39061a7a
diff --git a/manifest.uuid b/manifest.uuid
index 0cb0dd7214..9a5248b802 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e66289b52f56c8242aa264a9365c834cd820e988
\ No newline at end of file
+6331860e7754be6e0d2a484d66427947c0781dd6
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index cc91672c68..58918bbdba 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.216 2005/11/04 22:03:30 drh Exp $
+** @(#) $Id: pager.c,v 1.217 2005/11/05 15:11:23 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -1761,9 +1761,9 @@ void enable_simulated_io_errors(void){
   sqlite3_io_error_pending = saved_cnt;
 }
 #else
-# define clear_simulated_io_error(X)
-# define disable_simulated_io_errors(X)
-# define enable_simulated_io_errors(X)
+# define clear_simulated_io_error()
+# define disable_simulated_io_errors()
+# define enable_simulated_io_errors()
 #endif
 
 /*