From 0547e2ff7b36b85b37f8fc1a026422c089732296 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Sun, 8 Jan 2012 00:54:02 +0000 Subject: [PATCH] Fix harmless compiler warning seen with MSVC. FossilOrigin-Name: 9612bcd648c7654050ddb2f955a28cbc527a8c2e --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index ec605235a8..146e75abec 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\slemon\sin\scomputation\sof\swhich\snon-terminals\scan\sgenerate\san\nempty\sstring.\s\sThis\sbug\sand\sthe\sfix\smake\sabsolutely\sno\sdifference\sfor\sthe\ngrammar\sused\sby\sSQLite,\sbut\sit\scan\smake\sa\sdifference\swhen\slemon\sis\sused\nin\sother\sgrammars. -D 2012-01-07T15:17:18.449 +C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC. +D 2012-01-08T00:54:02.861 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -125,7 +125,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c 62e969b041adf54a0e982eafd3d7569dc01b9bfe F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c ef51e9043ff14aa886e2f12cd8d4c0207650c3d2 +F src/btree.c 378a0f39d6e25cc3f7c40db3d90ec6f0a29e7733 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce F src/btreeInt.h 6c9960645c431c9456ca56498f43a2b3bf1fa8c2 F src/build.c 8e2a4dedad860fed982270ef43968505f35ec57f @@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P d2a5685b5e282488df382fc210e4f0d786259658 -R a1466c1ec4ac2f5126c364ef99bb649f -U drh -Z bae7f4927646cf8baf17cbd773e91bac +P ce32775b232da894343f62deefaf19b0ec484636 +R 6f17126c629f0d285a4c36d9ff2269f9 +U mistachkin +Z 4d382f8e884a1c7125f36631da069e82 diff --git a/manifest.uuid b/manifest.uuid index ac7a2ce405..060007db7c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ce32775b232da894343f62deefaf19b0ec484636 \ No newline at end of file +9612bcd648c7654050ddb2f955a28cbc527a8c2e \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 4960d265f3..64ed28ea24 100644 --- a/src/btree.c +++ b/src/btree.c @@ -2438,7 +2438,7 @@ static int lockBtree(BtShared *pBt){ if( pBt->maxLocal>127 ){ pBt->max1bytePayload = 127; }else{ - pBt->max1bytePayload = pBt->maxLocal; + pBt->max1bytePayload = (u8)pBt->maxLocal; } assert( pBt->maxLeaf + 23 <= MX_CELL_SIZE(pBt) ); pBt->pPage1 = pPage1;