Fix a C++-ism in the code. (CVS 2430)

FossilOrigin-Name: 312587acf9e94e1d12390a9a0206c9464815e8d7

diff --git a/manifest b/manifest
index 1a3342271b8cad5a98ff1f2d55d21c9b58547a43..4f4952374b2bf96afb5eba9f79e1338c6374b108 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\s'stack'\sto\sthe\smore\sdescriptive\s'no-push'\sin\svdbe.c.\s(CVS\s2429)
-D 2005-03-29T13:07:00
+C Fix\sa\sC++-ism\sin\sthe\scode.\s(CVS\s2430)
+D 2005-03-29T13:17:46
 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -30,7 +30,7 @@ F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/alter.c 9570af388bc99471ea6e1258817fbf06e3120030
 F src/attach.c 3615dbe960cbee4aa5ea300b8a213dad36527b0f
 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
-F src/btree.c 50f31eb0844ca14614686163f8939b2999272b25
+F src/btree.c 25770f8cf1fe778757b69cbe0b84c02615c6e1f5
 F src/btree.h 41a71ce027db9ddee72cb43df2316bbe3a1d92af
 F src/build.c 8afb06c791adcde7787f157bbc55aeef27fb27c1
 F src/date.c 2134ef4388256e8247405178df8a61bd60dc180a
@@ -278,7 +278,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 7d6818da33a87076d1faf35ffc15a3aada0533b3
-R b2b5f4cce8b0df2fc23078e18d925b30
-U danielk1977
-Z 5e718761fcd6175855385aab184db7fd
+P 7e54d3c7289c091d449844d21b923e553f1d1f5f
+R f245d4dc2227a598a23dfc18cf50b5d7
+U drh
+Z 04bfdc8e7d327224ec41d75e396cd099

diff --git a/manifest.uuid b/manifest.uuid
index 8dfed604da4790effac98db6652fbf3216adc1e6..625473cbb02a8c0ef2f51124e5354d2f7f86e69c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e54d3c7289c091d449844d21b923e553f1d1f5f
\ No newline at end of file
+312587acf9e94e1d12390a9a0206c9464815e8d7
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 87726ae2a3f1c98b31302abf0362e18a13d9c199..a27568344d7d3a425b8500d0b821735e9add7f6c 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.255 2005/03/29 02:54:03 danielk1977 Exp $
+** $Id: btree.c,v 1.256 2005/03/29 13:17:46 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -4153,8 +4153,8 @@ static int balance_nonroot(MemPage *pPage){
   j = 0;
   for(i=0; i<nNew; i++){
     /* Assemble the new sibling page. */
-    assert( j<nMaxCells );
     MemPage *pNew = apNew[i];
+    assert( j<nMaxCells );
     assert( pNew->pgno==pgnoNew[i] );
     assemblePage(pNew, cntNew[i]-j, &apCell[j], &szCell[j]);
     assert( pNew->nCell>0 );