Add a few casts required by 64-bit VS2010 to the sessions code.

FossilOrigin-Name: 5ac4a06111b5fad5f58c20ef5d2b65aeb23e105a

diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index 78d2b6d86c8518ea323c151ede7f0274123942f0..577556ee922611772c6d15c5d3f3dbd7f17757e6 100644 (file)
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -1637,7 +1637,7 @@ static void sessionAppendTableHdr(
   sessionAppendByte(pBuf, 'T', pRc);
   sessionAppendVarint(pBuf, pTab->nCol, pRc);
   sessionAppendBlob(pBuf, pTab->abPK, pTab->nCol, pRc);
-  sessionAppendBlob(pBuf, (u8 *)pTab->zName, strlen(pTab->zName)+1, pRc);
+  sessionAppendBlob(pBuf, (u8 *)pTab->zName, (int)strlen(pTab->zName)+1, pRc);
 }
 
 /*
@@ -1951,7 +1951,7 @@ static int sessionChangesetNext(
     if( p->rc!=SQLITE_OK ) return p->rc;
   }
 
-  if( pnRec ){ *pnRec = aChange - *paRec; }
+  if( pnRec ){ *pnRec = (int)(aChange - *paRec); }
   p->pNext = aChange;
   return SQLITE_ROW;
 }
@@ -2806,7 +2806,7 @@ int sqlite3changeset_apply(
       schemaMismatch = (xFilter && (0==xFilter(pCtx, zNew)));
       if( schemaMismatch ){
         zTab = sqlite3_mprintf("%s", zNew);
-        nTab = strlen(zTab);
+        nTab = (int)strlen(zTab);
         sApply.azCol = (const char **)zTab;
       }else{
         sqlite3changeset_pk(pIter, &abPK, 0);
@@ -2995,7 +2995,7 @@ static int sessionChangeMerge(
       }
 
       if( pNew ){
-        pNew->nRecord = (aCsr - pNew->aRecord);
+        pNew->nRecord = (int)(aCsr - pNew->aRecord);
       }
       sqlite3_free(pExist);
     }
@@ -3042,7 +3042,7 @@ int sessionConcatChangeset(
 
     if( !pTab || zNew!=pTab->zName ){
       /* Search the list for a matching table */
-      int nNew = strlen(zNew);
+      int nNew = (int)strlen(zNew);
       u8 *abPK;
 
       sqlite3changeset_pk(pIter, &abPK, 0);

diff --git a/manifest b/manifest
index f77afa1ffeb16f2b661a0b920f934fcb637ebee9..02f04f5c40e81b50c1f24d755ddeac6729472c94 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sxFilter\scallback\sto\sthe\ssqlite3changeset_apply()\sfunction.\sThis\scallback\sallows\sthe\sapplication\sto\saccept\sor\sreject\schanges\son\sa\sper-table\sbasis\swhen\sapplying\sa\schangeset.
-D 2011-07-13T15:21:02.741
+C Add\sa\sfew\scasts\srequired\sby\s64-bit\sVS2010\sto\sthe\ssessions\scode.
+D 2011-07-15T19:11:32.763
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -110,7 +110,7 @@ F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 F ext/session/sessionfault.test 401045278298a242cbc2e4bc986c102f01ff2180
-F ext/session/sqlite3session.c c05d28332fcdd66c82de85f5459d71554e2259d7
+F ext/session/sqlite3session.c b31221e6e068476f736e8aaf5c7b66895d1b16f4
 F ext/session/sqlite3session.h f34905c818569779ddaea1bbef43469177614c69
 F ext/session/test_session.c 209f13fa8f4a597ffcc15fd0f8a3f27ed079c5e5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@ -961,7 +961,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 82ac16c4f873d3bd7c22f36ba7b974b4903a2d50
-R c22fa4ebad64b5fe1347a3f0a2dcb7e8
+P 282474c42f24f0e66c69b576b72ef8ce764d49e2
+R dce52d6dc32cededac0b5cc1823e4002
 U dan
-Z 6a509799e9e665bc4a33861bc6dba39f
+Z 91f64262d00fcd067a4fb1a130723392

diff --git a/manifest.uuid b/manifest.uuid
index 527039d08d4a04eb214a20ccb3756566ce67793f..1a2b253550cd85c307444d22a4859dabcb0cf6b8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-282474c42f24f0e66c69b576b72ef8ce764d49e2
\ No newline at end of file
+5ac4a06111b5fad5f58c20ef5d2b65aeb23e105a
\ No newline at end of file