From: drh Date: Wed, 24 Aug 2005 16:54:05 +0000 (+0000) Subject: Remove a stray C++ style comment causing problems for some compilers. (CVS 2621) X-Git-Tag: version-3.6.10~3538 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=978468d488db11fbe1a2459a75269e49bc93884b;p=thirdparty%2Fsqlite.git Remove a stray C++ style comment causing problems for some compilers. (CVS 2621) FossilOrigin-Name: aa7dd3f2c72335fe7778c021e4b6bbbc4ec322df --- diff --git a/manifest b/manifest index 29a151d7fc..d22e970830 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sDELETE\sthat\smight\scause\sa\ssegfault\swhen\sdeleting\smore\nthan\s40940\srows\sof\sdata\sall\sat\sonce.\s(CVS\s2620) -D 2005-08-24T16:13:52 +C Remove\sa\sstray\sC++\sstyle\scomment\scausing\sproblems\sfor\ssome\scompilers.\s(CVS\s2621) +D 2005-08-24T16:54:05 F Makefile.in b109ddb46a5550d0732dcd6caca01c123f6d5cdd F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -40,7 +40,7 @@ F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940 F src/delete.c be1fc25c9e109cd8cbab42a43ee696263da7c04b F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d -F src/expr.c 43d49f124badc9b883cd7315c42a7564c9a59be9 +F src/expr.c e05fa8448a6417ef996c48c66397a05f58594e14 F src/func.c 5b12db87f0bc7d978eaf87c7a348ada5d1934da4 F src/hash.c 2b1b13f7400e179631c83a1be0c664608c8f021f F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84 @@ -298,7 +298,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 8cef2c1ae728970a38d794f9903115da5d0fcd55 -R a70653770f548ef58ecb2d4303ec79dd +P 7c599bae33ba4eb10fc486ae3dab76330ce69936 +R 381eac69e5e96973f936215326a0bace U drh -Z 4fc4e011eef56b244e6411516a20c5a0 +Z f5aec42c541d58f1f45bc7db39e5e79c diff --git a/manifest.uuid b/manifest.uuid index 13623ac161..c8b4a46b19 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7c599bae33ba4eb10fc486ae3dab76330ce69936 \ No newline at end of file +aa7dd3f2c72335fe7778c021e4b6bbbc4ec322df \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 6808c4f99e..e431da1ec8 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.219 2005/08/23 11:17:59 drh Exp $ +** $Id: expr.c,v 1.220 2005/08/24 16:54:05 drh Exp $ */ #include "sqliteInt.h" #include @@ -1741,7 +1741,6 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3DequoteExpr(pExpr); sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn, pExpr->token.z, pExpr->token.n); -// sqlite3VdbeDequoteP3(v, -1); } else { assert( pExpr->iColumn == OE_Ignore ); sqlite3VdbeAddOp(v, OP_ContextPop, 0, 0);