From ba7cce317bd8da97f01096fc3f0993d2f5c577f9 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Fri, 24 Mar 2017 19:45:05 +0000
Subject: [PATCH] Fix a harmless compiler warning in the JSON1 extension.

FossilOrigin-Name: c2c3dd84534bb5ea81c974847b74a166c9cba1545fc749ce625929f303bf22e4
---
 ext/misc/json1.c |  2 +-
 manifest         | 12 ++++++------
 manifest.uuid    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 2689726302..7563229136 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1397,7 +1397,7 @@ static JsonNode *jsonMergePatch(
   }
   iRoot = iTarget;
   for(i=1; i<pPatch->n; i += jsonNodeSize(&pPatch[i+1])+1){
-    int nKey;
+    u32 nKey;
     const char *zKey;
     assert( pPatch[i].eType==JSON_STRING );
     assert( pPatch[i].jnFlags & JNODE_LABEL );
diff --git a/manifest b/manifest
index e0db435a03..909b15bb9f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Previous\scheck-in\swas\snot\scorrect.\s\sThis\sis\sa\sbetter\sfix\sfor\sthe\sOP_Once\nproblem\sof\sticket\s[06796225f59c057cd120f1].
-D 2017-03-24T18:38:41.822
+C Fix\sa\sharmless\scompiler\swarning\sin\sthe\sJSON1\sextension.
+D 2017-03-24T19:45:05.590
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -218,7 +218,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c 52f93b91b8bbbfcd84dca34be383974137e83a1673c71d5f728b16b68bb57d9c
+F ext/misc/json1.c f963c2b86201c4a91a40b8e1a36e9ae8b9787435be09e0a77f4af3366a21b8e5
 F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
@@ -1569,7 +1569,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 2556014514f36808e6d18b25722eae0daeeb8fbb5d18af13a9698ea6c6db1679
-R 0d4df4a8a9e2796f99d4dab5fea97642
+P 8194dd2814b0b3f8cffbcb16306f55aabf1c1508b9d27fa806f92f0e6ecd7631
+R 62e08e896f8ca109e8d6d3c509082b9a
 U drh
-Z 19353cf9e153b27d983c51cfd380c21a
+Z 05f31e3559927efd389ed5e57c4ee57c
diff --git a/manifest.uuid b/manifest.uuid
index 71e1d00f96..c8b35554c2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8194dd2814b0b3f8cffbcb16306f55aabf1c1508b9d27fa806f92f0e6ecd7631
\ No newline at end of file
+c2c3dd84534bb5ea81c974847b74a166c9cba1545fc749ce625929f303bf22e4
\ No newline at end of file