From: drh <drh@noemail.net>
Date: Fri, 12 Jun 2009 11:42:11 +0000 (+0000)
Subject: Remove a C++-ism from the code.  Ticket #3912. (CVS 6752)
X-Git-Tag: version-3.6.15~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8be4f639d987e6e31ce2ec5c0d044713a10b29d3;p=thirdparty%2Fsqlite.git

Remove a C++-ism from the code.  Ticket #3912. (CVS 6752)

FossilOrigin-Name: bc729bc3e6f6e3570103e646080eb119311b0fa7
---

diff --git a/manifest b/manifest
index 5cd8cb8f96..2b0201152b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C An\sadditional\smemory\sleak\sin\sthe\sparser\sfixed.\s\sTicket\s#3911.\s(CVS\s6751)
-D 2009-06-12T03:47:37
+C Remove\sa\sC++-ism\sfrom\sthe\scode.\s\sTicket\s#3912.\s(CVS\s6752)
+D 2009-06-12T11:42:12
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -197,7 +197,7 @@ F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
 F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
 F src/test_thread.c b8a1ab7ca1a632f18e8a361880d5d65eeea08eac
 F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241
-F src/tokenize.c d8c6b39a6056db2b47a212607689dd7ee8031c69
+F src/tokenize.c c0d3e8e9532fc771ff52ac99abcbdb127b14328d
 F src/trigger.c c07c5157c58fcdb704f65d5f5e4775276e45bb8b
 F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
@@ -734,7 +734,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P bd341a103c25395b1189d05edebfe4af8a943941
-R cd135e548bd04e4130a04a18089f1ed0
+P 6197b492714e16396941ae6ba61f90f708d54728
+R 35a287ed30a5a4abe3f9902d086b75b9
 U drh
-Z 1b96a3fcbabb94cf9a879e6d3b453efa
+Z ccc38ec38f2ea3ed8385702ad4474d78
diff --git a/manifest.uuid b/manifest.uuid
index 2e4745375f..579bdfc1f0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6197b492714e16396941ae6ba61f90f708d54728
\ No newline at end of file
+bc729bc3e6f6e3570103e646080eb119311b0fa7
\ No newline at end of file
diff --git a/src/tokenize.c b/src/tokenize.c
index 8784c3cba8..9dabbde983 100644
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.159 2009/06/09 18:01:38 drh Exp $
+** $Id: tokenize.c,v 1.160 2009/06/12 11:42:12 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdlib.h>
@@ -330,8 +330,8 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
 #endif
     case '@':  /* For compatibility with MS SQL Server */
     case ':': {
-      testcase( z[0]=='$' );  testcase( z[0]=='@' );  testcase( z[0]==':' );
       int n = 0;
+      testcase( z[0]=='$' );  testcase( z[0]=='@' );  testcase( z[0]==':' );
       *tokenType = TK_VARIABLE;
       for(i=1; (c=z[i])!=0; i++){
         if( IdChar(c) ){