From: drh <drh@noemail.net>
Date: Thu, 8 Sep 2005 19:01:05 +0000 (+0000)
Subject: Remove a C++ism that snuck in on one of the reason changes. (CVS 2676)
X-Git-Tag: version-3.6.10~3483
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=825c662e66294bce1a805e16177e57565f28503f;p=thirdparty%2Fsqlite.git

Remove a C++ism that snuck in on one of the reason changes. (CVS 2676)

FossilOrigin-Name: 48f6a331efea419fe948cd366f9c60ae41edddfd
---

diff --git a/manifest b/manifest
index add0e5fe57..bab4d18316 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sfew\sunused\svariables\sdetected\sby\sBorland\sC.\s\sTicket\s#1412.\s(CVS\s2675)
-D 2005-09-08T14:17:20
+C Remove\sa\sC++ism\sthat\ssnuck\sin\son\sone\sof\sthe\sreason\schanges.\s(CVS\s2676)
+D 2005-09-08T19:01:06
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -83,7 +83,7 @@ F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c
 F src/vdbe.c f722fbaf81890c342a1e1bf5a8a1600c5212ba47
 F src/vdbe.h c8e105979fc7aaf5b8004e9621904e3bd096dfa2
 F src/vdbeInt.h 3dd2a29c7b0a55404c35f93caae81fb42f4cb70a
-F src/vdbeapi.c 6df708808458df837100521be72e728a581b5206
+F src/vdbeapi.c 72213ce0c1ab8b215b2ae0ed342511bf769c1e60
 F src/vdbeaux.c a0aaf135c39825027366b5129f85191226d8b333
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c fea0744936008831daa17cdc75056c3ca1469690
@@ -306,7 +306,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0c3e368d4766685b94a44f2c514e2dea806c297c
-R 2154391a51bd3c5316cb4611d67dd0e3
+P cdfe372a958fb446485913e860d52b87fffd34e4
+R 90ad4b515120e3af2e9b022d1054c0bf
 U drh
-Z 3f3449015248b67f23f79f2beae7c832
+Z b72ca3f8146ea206fe3fcf97bfef6a79
diff --git a/manifest.uuid b/manifest.uuid
index ca41482caf..aa1b88b562 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdfe372a958fb446485913e860d52b87fffd34e4
\ No newline at end of file
+48f6a331efea419fe948cd366f9c60ae41edddfd
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index b32ae1de4b..1da5a4493a 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -257,8 +257,8 @@ void *sqlite3_user_data(sqlite3_context *p){
 ** same context that was returned on prior calls.
 */
 void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){
-  assert( p && p->pFunc && p->pFunc->xStep );
   Mem *pMem = p->pMem;
+  assert( p && p->pFunc && p->pFunc->xStep );
   if( (pMem->flags & MEM_Agg)==0 ){
     if( nByte==0 ){
       assert( pMem->flags==MEM_Null );