couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [1/2] git commit: fix shadowing warning.
Date Thu, 06 Oct 2011 11:04:47 GMT
Updated Branches:
  refs/heads/1.1.x e6c0fc955 -> 4818fdd32


fix shadowing warning.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4818fdd3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4818fdd3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4818fdd3

Branch: refs/heads/1.1.x
Commit: 4818fdd3269a3082a193ec69f4e8e39d95c15e86
Parents: 5b558c8
Author: Robert Newson <rnewson@apache.org>
Authored: Thu Oct 6 10:46:04 2011 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu Oct 6 10:46:04 2011 +0100

----------------------------------------------------------------------
 src/couchdb/couch_doc.erl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/4818fdd3/src/couchdb/couch_doc.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl
index 01e9283..f55e951 100644
--- a/src/couchdb/couch_doc.erl
+++ b/src/couchdb/couch_doc.erl
@@ -313,7 +313,7 @@ max_seq(Tree, UpdateSeq) ->
     end,
     couch_key_tree:fold(FoldFun, UpdateSeq, Tree).
 
-to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=Seq}) ->
+to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=Seq0}) ->
     RevInfosAndPath =
         [{#rev_info{deleted=Del,body_sp=Bp,seq=Seq,rev={Pos,RevId}}, Path} ||
             {{Del, Bp, Seq},{Pos, [RevId|_]}=Path} <-
@@ -326,7 +326,7 @@ to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=Seq}) ->
         end, RevInfosAndPath),
     [{_RevInfo, WinPath}|_] = SortedRevInfosAndPath,
     RevInfos = [RevInfo || {RevInfo, _Path} <- SortedRevInfosAndPath],
-    {#doc_info{id=Id, high_seq=max_seq(Tree, Seq), revs=RevInfos}, WinPath}.
+    {#doc_info{id=Id, high_seq=max_seq(Tree, Seq0), revs=RevInfos}, WinPath}.
 
 
 


Mime
View raw message