From: drh <drh@noemail.net>
Date: Thu, 10 Nov 2016 16:07:43 +0000 (+0000)
Subject: Remove C++ style comments.  No code changes.
X-Git-Tag: version-3.16.0~126^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf2f5739c956bdd508d427c269e0b46c05025544;p=thirdparty%2Fsqlite.git

Remove C++ style comments.  No code changes.

FossilOrigin-Name: 42f8aa6231bf4ed74bebdc85aa79d23dc20b3c14
---

diff --git a/manifest b/manifest
index 927eabb417..61e973e4b9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sunpacked\skey\sfields\sto\sOP_IdxInsert\sfor\sINSERT\sand\sUPDATE\sstatements.
-D 2016-11-10T14:24:04.595
+C Remove\sC++\sstyle\scomments.\s\sNo\scode\schanges.
+D 2016-11-10T16:07:43.214
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@ -349,7 +349,7 @@ F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c ba2f101575111114da6a4e7a231949b5d0bf2bc0
+F src/insert.c 63bec2cbffc09d2ea45e0980ded1ebc0e8ef6823
 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
 F src/main.c 694ac90557abdaa62151a6090670e107b0f2c2ab
@@ -1530,7 +1530,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 345b46be75bdf6f9fb7367a6164d89bae11995a6
-R e1b2caf55e9d3843f543e00160355508
+P 67602e40f122cbb6354048a64c5d3a72b2855ec7
+R babf57682996bf94e8ad4ede9c8310bb
 U drh
-Z 41e31850fcf9fee16d82b22da63518af
+Z a2fd3a9e97e33aae9cbdedab39a4dc89
diff --git a/manifest.uuid b/manifest.uuid
index d20d303140..7bc55dc8ed 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-67602e40f122cbb6354048a64c5d3a72b2855ec7
\ No newline at end of file
+42f8aa6231bf4ed74bebdc85aa79d23dc20b3c14
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 361c3a3a6d..85f34f0683 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1515,7 +1515,7 @@ void sqlite3GenerateConstraintChecks(
     /* Create a record for this index entry as it should appear after
     ** the insert or update.  Store that record in the aRegIdx[ix] register
     */
-    regIdx = aRegIdx[ix]+1; // sqlite3GetTempRange(pParse, pIdx->nColumn);
+    regIdx = aRegIdx[ix]+1;
     for(i=0; i<pIdx->nColumn; i++){
       int iField = pIdx->aiColumn[i];
       int x;
@@ -1552,7 +1552,6 @@ void sqlite3GenerateConstraintChecks(
     /* Find out what action to take in case there is a uniqueness conflict */
     onError = pIdx->onError;
     if( onError==OE_None ){ 
-//      sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn);
       sqlite3VdbeResolveLabel(v, addrUniqueOk);
       continue;  /* pIdx is not a UNIQUE index */
     }
@@ -1651,7 +1650,6 @@ void sqlite3GenerateConstraintChecks(
       }
     }
     sqlite3VdbeResolveLabel(v, addrUniqueOk);
-    // sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn);
     if( regR!=regIdx ) sqlite3ReleaseTempRange(pParse, regR, nPkField);
   }
   if( ipkTop ){